powerpc: E500: Move CONFIG_E500 and CONFIG_E500MC to Kconfig

Use Kconfig option for E500 and E500MC macros.

Signed-off-by: York Sun <york.sun@nxp.com>

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index e4873f5e82bf13030df8f60c5ca75f5d875f9a77..6d8709e76c9f6e810e25000ebb16be8127694b8a 100644 (file)
--- 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 7d3ebf33c75bd81a689cc5a378b6a71f05a38bea..e3ed3178a08046afcf3c04c4a0f3453ced329a6e 100644 (file)
--- 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 eecbd7572e2944b4fad057533dc10404a3a8a5fc..33c015a6ab8e90ac958a1c80561ce683c3f19cac 100644 (file)
--- 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 6663a923effb456d54256df9d46a512050a185d7..64b502d459703f1774f587d3d04cf484f62bcded 100644 (file)
--- 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 79cf09e1a28f8303e9dae1f1083e12e38a82c17a..a47d23ce1cdd74cefac7f70a5159d202a9a825ef 100644 (file)
--- 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 b17a6c570d0f9059062d424680240e59b6fa3af5..46ba306632cb8a29699bcecac1f979d96871e8be 100644 (file)
--- 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 9fd710946024f85afcab606e396d2b25182f59d3..02ad0b0f260c34dc319157d29cb76fbc8216a62f 100644 (file)
--- 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 2dad1887e004a705f8e28e572b69964dbc80c5f3..0d850fe2f116b0cd10a5536b6c2d427eacce2fe5 100644 (file)
--- 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 4bab8938006014f36c34fe56afef724d8f36fbae..96c0b114f6e5385c8d76895226de711798a68785 100644 (file)
--- 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 41ba9e7e7acedb10461f68b99b907c8307f0b0cb..7ffacf8a57d20965484f6f8f12ce9c0fc570277b 100644 (file)
--- 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 0f035ddb95eda0d0c020f8208a565d12d1353641..9f75f9baf82bcb10d90697635fe185e070b7f485 100644 (file)
--- 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 343287efeaa638579cb3d16411590f8e78a2c9e4..871d14e93a1df0f898dadd72c533e71fd2fd1e91 100644 (file)
--- 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 3cddb5fb83a7f92da53e2b5f61e8c018e124b1d7..84fea61746388a6a2553e2c4df7274bf669b90ef 100644 (file)
--- 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 bd15645934501d0139187e27ca1b6447654bddb8..08d61cd8cbe5652f9c9a22f0f962b718b24205f4 100644 (file)
--- 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 bffcad162ccdd09e17809cd5927f12dbe4ba92b6..1c7dbc853e9ec17ea510fed1a0ad9164adfdbd04 100644 (file)
--- 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 4d0ae9d8b04b346dd6f3046f327ca33ed8531228..3077b05fe5f812f08bb0f6d4461a28ad8b668ca4 100644 (file)
--- 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 <asm/config_mpc85xx.h>
 #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 169f94a366038a601bde9c818d65d93bff7e1c2b..78d5b5d996be8d951bfd96e591949f96c9bcdd4e 100644 (file)
--- 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 d5728a1d90af9a0b74068de99860a9664812373c..1ebe83689ed9205f3a37b8f9cd8a3d0aaba434c7 100644 (file)
--- 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 7a3fa03c3dd6bea916d8c27a53f4684682024bb6..5107aaaed0e08b1991e0260a7252324aad185d60 100644 (file)
--- 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 303c73bf1b2fee7dd65ebd565f7664242290ec5c..b2c922141396e58d273192262dd380e204a4eea2 100644 (file)
--- 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 e451851549d25725c8e386ef7f2d6116b202f3e2..c2bdef3451f25e6d025952cbff0070c1c9fb8d8d 100644 (file)
--- 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 7779c3189accfdfd42f9117fc99a0f7fe88d201a..018a5196a846ccdf35bdfcb7df38762db8b88e8e 100644 (file)
--- 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 41cb43cfa16348d277cde2117d18043dcacf5c2e..abf0d714f1cd0c87733bb07ebb080b2eec4b9ffe 100644 (file)
--- 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 <asm/config_mpc85xx.h>
 
 #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 878dbed1a1160dc916db912cd6563c2f9e4252a5..d90056ea59de427effaa4a669805589bb11da3d5 100644 (file)
--- 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 ee27a8fb34122c67172da2985a375f4a938c60ad..af229005ec033ede229e0311ef7103cd807b3d7d 100644 (file)
--- 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 5b3c6fa9d6a54ed7c1ec70020b5b3e1317d9a92e..445af8436d70c48d94c40841b2413d70970469d9 100644 (file)
--- 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 0775603b9e28f12c35b1b9b2fec234c275531ada..29544b28a874df333aad3c457f792a6e3548e567 100644 (file)
--- 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 e0290e72af5a0d14fad6b643785a1793a7a6b34f..4f6927c182a8344f3dedf100c384b1261783bb20 100644 (file)
--- 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 c4d172d127f400a6f393310db2b55fc0fd39eb39..5720386d1e4bdeb38965904e591a7657a2187d38 100644 (file)
--- 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 0307b144bd7d4751c9c873a8d2f829345d472807..b0ae073a968a639d785a9ea21fda3960559c26b0 100644 (file)
--- 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 affcb4886849d38e1dc1e7212669a016ef1c802c..87f1932513cf1ef145e7bd9215f01db1ce7162f0 100644 (file)
--- 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 8668495d178671bb2f8d9d32a18531582cece422..d3e058526c911abf0f3492045966eb2c3983b2d3 100644 (file)
--- 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 a9b202084211aa64284c34c2de325b8a6745049f..0cf6bf23dd1bff4118879ffaeca5e6a2d54672b4 100644 (file)
--- 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 2c85f65fc84e4919f40ff706a7aa562777497095..9517674010b6ac698c0a7184e15c91d1e4e02bb0 100644 (file)
--- 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 617be273ec20906633c56045f0480bd0c386c489..b81ff75656b5ddc30e46ca9668288498ba749f01 100644 (file)
--- 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 81afed06b9180df84e1dfdfced12984b833fd405..d148f877fa6813da8e08e2f9301b14b12e28c0e7 100644 (file)
--- 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 e2b117150d737b27dedc8bf7a4735918e8ac0df5..91982a4ffeabc6349ac3b6fc489848b9188a2bd2 100644 (file)
--- 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 fee8c34d2cc080b56e612cbf6f3b039b8bd0429b..22ada4c1d424c98246455720771ed50162f6f28e 100644 (file)
--- 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 7e811d50e97e6afe52b2730da64b1e493a954640..73a8a20cc6f8379124a01a59b627c12bf124150b 100644 (file)
--- 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 4dfb79d7ceb190bf4ab3b7f774aa5183e4f72b5c..7582813498169225fb8ca49a5ee2cd25477dd2bc 100644 (file)
--- 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 6d614c62ccf251f3d3ed41257b8ae470ea133719..ea12cf1bf3b44f8717705b268e4ff5aeaa7fdac4 100644 (file)
--- 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