From f8dee360341538f80a1b61b632c852c443ba5558 Mon Sep 17 00:00:00 2001 From: York Sun Date: Wed, 28 Dec 2016 08:43:27 -0800 Subject: [PATCH] powerpc: E500: Move CONFIG_E500 and CONFIG_E500MC to Kconfig Use Kconfig option for E500 and E500MC macros. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 30 +++++++++++++++++++++++++++++ include/configs/B4860QDS.h | 3 --- include/configs/BSC9131RDB.h | 2 -- include/configs/BSC9132QDS.h | 2 -- include/configs/C29XPCIE.h | 2 -- include/configs/MPC8536DS.h | 4 ---- include/configs/MPC8540ADS.h | 4 ---- include/configs/MPC8541CDS.h | 2 -- include/configs/MPC8544DS.h | 4 ---- include/configs/MPC8548CDS.h | 4 ---- include/configs/MPC8555CDS.h | 2 -- include/configs/MPC8560ADS.h | 2 -- include/configs/MPC8568MDS.h | 4 ---- include/configs/MPC8569MDS.h | 4 ---- include/configs/MPC8572DS.h | 2 -- include/configs/P1010RDB.h | 3 --- include/configs/P1022DS.h | 2 -- include/configs/P1023RDB.h | 2 -- include/configs/P2041RDB.h | 3 --- include/configs/T102xQDS.h | 3 --- include/configs/T102xRDB.h | 3 --- include/configs/T1040QDS.h | 3 --- include/configs/T104xRDB.h | 3 --- include/configs/T208xQDS.h | 3 --- include/configs/T208xRDB.h | 3 --- include/configs/T4240RDB.h | 3 --- include/configs/UCP1020.h | 5 ----- include/configs/controlcenterd.h | 2 -- include/configs/corenet_ds.h | 3 --- include/configs/cyrus.h | 3 --- include/configs/km/kmp204x-common.h | 3 --- include/configs/p1_p2_rdb_pc.h | 4 ---- include/configs/p1_twr.h | 4 ---- include/configs/qemu-ppce500.h | 4 ---- include/configs/sbc8548.h | 2 -- include/configs/socrates.h | 2 -- include/configs/t4qds.h | 3 --- include/configs/xpedite520x.h | 2 -- include/configs/xpedite537x.h | 2 -- include/configs/xpedite550x.h | 2 -- scripts/config_whitelist.txt | 2 -- 41 files changed, 30 insertions(+), 115 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index e4873f5e82..6d8709e76c 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -323,10 +323,12 @@ endchoice config ARCH_B4420 bool + select E500MC select FSL_LAW config ARCH_B4860 bool + select E500MC select FSL_LAW config ARCH_BSC9131 @@ -419,22 +421,27 @@ config ARCH_P2020 config ARCH_P2041 bool + select E500MC select FSL_LAW config ARCH_P3041 bool + select E500MC select FSL_LAW config ARCH_P4080 bool + select E500MC select FSL_LAW config ARCH_P5020 bool + select E500MC select FSL_LAW config ARCH_P5040 bool + select E500MC select FSL_LAW config ARCH_QEMU_E500 @@ -442,36 +449,59 @@ config ARCH_QEMU_E500 config ARCH_T1023 bool + select E500MC select FSL_LAW config ARCH_T1024 bool + select E500MC select FSL_LAW config ARCH_T1040 bool + select E500MC select FSL_LAW config ARCH_T1042 bool + select E500MC select FSL_LAW config ARCH_T2080 bool + select E500MC select FSL_LAW config ARCH_T2081 bool + select E500MC select FSL_LAW config ARCH_T4160 bool + select E500MC select FSL_LAW config ARCH_T4240 bool + select E500MC select FSL_LAW +config BOOKE + bool + default y + +config E500 + bool + default y + help + Enable PowerPC E500 cores, including e500v1, e500v2, e500mc + +config E500MC + bool + help + Enble PowerPC E500MC core + config FSL_LAW bool help diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 7d3ebf33c7..e3ed3178a0 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -50,9 +50,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index eecbd7572e..33c015a6ab 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -46,8 +46,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE /* BOOKE */ -#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_FSL_IFC /* Enable IFC Support */ #define CONFIG_FSL_CAAM /* Enable SEC/CAAM */ diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 6663a923ef..64b502d459 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -69,8 +69,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE /* BOOKE */ -#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_FSL_IFC /* Enable IFC Support */ #define CONFIG_FSL_CAAM /* Enable SEC/CAAM */ #define CONFIG_SYS_HAS_SERDES /* common SERDES init code */ diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 79cf09e1a2..a47d23ce1c 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -68,8 +68,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE /* BOOKE */ -#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_FSL_IFC /* Enable IFC Support */ #define CONFIG_FSL_CAAM /* Enable SEC/CAAM */ #define CONFIG_SYS_HAS_SERDES /* common SERDES init code */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index b17a6c570d..46ba306632 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -37,10 +37,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif -/* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ - #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) */ diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 9fd7109460..02ad0b0f26 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -18,10 +18,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ - /* * default CCARBAR is at 0xff700000 * assume U-Boot is less than 0.5MB diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 2dad1887e0..0d850fe2f1 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -14,8 +14,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_CPM2 1 /* has CPM2 */ #define CONFIG_SYS_TEXT_BASE 0xfff80000 diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 4bab893800..96c0b114f6 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -11,10 +11,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ - #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xfff80000 #endif diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 41ba9e7e7a..7ffacf8a57 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -13,10 +13,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ - #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xfff80000 #endif diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 0f035ddb95..9f75f9baf8 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -14,8 +14,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_CPM2 1 /* has CPM2 */ #define CONFIG_SYS_TEXT_BASE 0xfff80000 diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 343287efea..871d14e93a 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -19,8 +19,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_CPM2 1 /* has CPM2 */ /* diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 3cddb5fb83..84fea61746 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -10,10 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ - #define CONFIG_SYS_TEXT_BASE 0xfff80000 #define CONFIG_SYS_SRIO diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index bd15645934..08d61cd8cb 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -10,10 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ - #define CONFIG_FSL_ELBC 1 /* Has Enhance localbus controller */ #define CONFIG_SYS_SRIO diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index bffcad162c..1c7dbc853e 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -26,8 +26,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_MP 1 /* support multiple processors */ #define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 4d0ae9d8b0..3077b05fe5 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -11,7 +11,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_E500 /* BOOKE e500 family */ #include #define CONFIG_NAND_FSL_IFC @@ -131,8 +130,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE /* BOOKE */ -#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_FSL_IFC /* Enable IFC Support */ #define CONFIG_FSL_CAAM /* Enable SEC/CAAM */ #define CONFIG_SYS_HAS_SERDES /* common SERDES init code */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 169f94a366..78d5b5d996 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -86,8 +86,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE /* BOOKE */ -#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_MP /* support multiple processors */ #ifndef CONFIG_SYS_TEXT_BASE diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index d5728a1d90..1ebe83689e 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -23,8 +23,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE /* BOOKE */ -#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_MP /* support multiple processors */ #define CONFIG_FSL_ELBC /* Has Enhanced localbus controller */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 7a3fa03c3d..5107aaaed0 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -28,9 +28,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 303c73bf1b..b2c9221413 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -12,9 +12,6 @@ #define __T1024QDS_H /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index e451851549..c2bdef3451 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -12,9 +12,6 @@ #define __T1024RDB_H /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 7779c3189a..018a5196a8 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -36,9 +36,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 41cb43cfa1..abf0d714f1 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -10,7 +10,6 @@ /* * T104x RDB board configuration file */ -#define CONFIG_E500 /* BOOKE e500 family */ #include #ifdef CONFIG_RAMBOOT_PBL @@ -147,8 +146,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 878dbed1a1..d90056ea59 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -24,9 +24,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index ee27a8fb34..af229005ec 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -17,9 +17,6 @@ #define CONFIG_FSL_SATA_V2 /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ #define CONFIG_ENABLE_36BIT_PHYS diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 5b3c6fa9d6..445af8436d 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -60,9 +60,6 @@ #define CONFIG_CMD_REGINFO /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 0775603b9e..29544b28a8 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -115,11 +115,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif -/* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 -/* #define CONFIG_MPC85xx */ - #define CONFIG_MP #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index e0290e72af..4f6927c182 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -35,8 +35,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE /* BOOKE */ -#define CONFIG_E500 /* BOOKE e500 family */ #define CONFIG_CONTROLCENTERD #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index c4d172d127..5720386d1e 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -46,9 +46,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 0307b144bd..b0ae073a96 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -38,9 +38,6 @@ #endif /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index affcb48868..87f1932513 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -29,9 +29,6 @@ #define CONFIG_SYS_FSL_PBL_RCW board/keymile/kmp204x/rcw_kmp204x.cfg /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 8668495d17..d3e058526c 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -258,10 +258,6 @@ #endif #endif -/* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 - #define CONFIG_MP #define CONFIG_FSL_ELBC diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index a9b2020842..0cf6bf23dd 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -38,10 +38,6 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif -/* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 - #define CONFIG_MP #define CONFIG_FSL_ELBC diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 2c85f65fc8..9517674010 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -12,10 +12,6 @@ #define CONFIG_CMD_REGINFO -/* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ - #undef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xf01000 /* 15 MB */ diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 617be273ec..b81ff75656 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -36,8 +36,6 @@ /* * High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_SBC8548 1 /* SBC8548 board specific */ /* diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 81afed06b9..d148f877fa 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -18,8 +18,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_SOCRATES 1 #define CONFIG_SYS_TEXT_BASE 0xfff80000 diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index e2b117150d..91982a4ffe 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -13,9 +13,6 @@ #define CONFIG_CMD_REGINFO /* High Level Configuration Options */ -#define CONFIG_BOOKE -#define CONFIG_E500 /* BOOKE e500 family */ -#define CONFIG_E500MC /* BOOKE e500mc family */ #define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */ #define CONFIG_MP /* support multiple processors */ diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index fee8c34d2c..22ada4c1d4 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -14,8 +14,6 @@ /* * High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_XPEDITE5200 1 #define CONFIG_SYS_BOARD_NAME "XPedite5200" #define CONFIG_SYS_FORM_PMC_XMC 1 diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 7e811d50e9..73a8a20cc6 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -14,8 +14,6 @@ /* * High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_SYS_BOARD_NAME "XPedite5370" #define CONFIG_SYS_FORM_3U_VPX 1 #define CONFIG_BOARD_EARLY_INIT_R /* Call board_pre_init */ diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 4dfb79d7ce..7582813498 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -14,8 +14,6 @@ /* * High Level Configuration Options */ -#define CONFIG_BOOKE 1 /* BOOKE */ -#define CONFIG_E500 1 /* BOOKE e500 family */ #define CONFIG_XPEDITE550X 1 #define CONFIG_SYS_BOARD_NAME "XPedite5500" #define CONFIG_SYS_FORM_PMC_XMC 1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 6d614c62cc..ea12cf1bf3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -957,8 +957,6 @@ CONFIG_DW_WDT_CLOCK_KHZ CONFIG_DYNAMIC_MMC_DEVNO CONFIG_E1000_NO_NVM CONFIG_E300 -CONFIG_E500 -CONFIG_E500MC CONFIG_E5500 CONFIG_E6500 CONFIG_EBCAW_VAL -- 2.30.2