summaryrefslogtreecommitdiff
path: root/include/configs/cyrus.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-02-03 20:33:42 -0500
committerTom Rini <trini@konsulko.com>2017-02-03 20:33:42 -0500
commitc83a824e62277162ad35f52879b2316902c0eff5 (patch)
treefa91cdcda24b8822d0f1e52786b2657e4d68be27 /include/configs/cyrus.h
parent0ff27d4a94637d4b1937c625d33212375bd118d9 (diff)
parentadd63f94a9c3bbe1af3fdf3f4c56a5185a4c0504 (diff)
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/cyrus.h')
-rw-r--r--include/configs/cyrus.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index c9a57afbae..3f195ab413 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -49,7 +49,6 @@
#define CONFIG_SYS_FSL_CPC /* Corenet Platform Cache */
#define CONFIG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS
-#define CONFIG_FSL_ELBC /* Has Enhanced localbus controller */
#define CONFIG_PCIE1 /* PCIE controller 1 */
#define CONFIG_PCIE2 /* PCIE controller 2 */
#define CONFIG_FSL_PCI_INIT /* Use common FSL init code */