diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-04 01:33:42 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-04 01:33:42 (GMT) |
| commit | c83a824e62277162ad35f52879b2316902c0eff5 (patch) | |
| tree | fa91cdcda24b8822d0f1e52786b2657e4d68be27 /include/configs/MPC8536DS.h | |
| parent | 0ff27d4a94637d4b1937c625d33212375bd118d9 (diff) | |
| parent | add63f94a9c3bbe1af3fdf3f4c56a5185a4c0504 (diff) | |
| download | u-boot-c83a824e62277162ad35f52879b2316902c0eff5.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/ls1046aqds_defconfig
configs/ls1046aqds_nand_defconfig
configs/ls1046aqds_qspi_defconfig
configs/ls1046aqds_sdcard_ifc_defconfig
configs/ls1046aqds_sdcard_qspi_defconfig
configs/ls1046ardb_emmc_defconfig
configs/ls1046ardb_qspi_defconfig
configs/ls1046ardb_sdcard_defconfig
Diffstat (limited to 'include/configs/MPC8536DS.h')
| -rw-r--r-- | include/configs/MPC8536DS.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 4635cdf..b9eab4e 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -37,7 +37,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif -#define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */ #define CONFIG_PCI1 1 /* Enable PCI controller 1 */ #define CONFIG_PCIE1 1 /* PCIE controller 1 (slot 1) */ #define CONFIG_PCIE2 1 /* PCIE controller 2 (slot 2) */ |