powerpc: mpc85xx: move CONFIG_MPC85xx definition to CPU config.mk

Define CONFIG_MPC85xx in arch/powerpc/cpu/mpc85xx/config.mk
because all target boards with mpc85xx cpu define it.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

diff --git a/arch/powerpc/cpu/mpc85xx/config.mk b/arch/powerpc/cpu/mpc85xx/config.mk
index 72c964cd151c89eab2ed5fcaec2011ac975df687..1470f95ff1f5d7c252c42a73de0d6134201ae241 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/config.mk
+++ b/arch/powerpc/cpu/mpc85xx/config.mk
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-PLATFORM_CPPFLAGS += -Wa,-me500 -msoft-float -mno-string
+PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx -Wa,-me500 -msoft-float -mno-string
 
 # -mspe=yes is needed to have -mno-spe accepted by a buggy GCC;
 # see "[PATCH,rs6000] make -mno-spe work as expected" on

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 39c0b6d8c7ee729cb936d9f98e5c697c78d122ce..64acc88b7a7859131a7e3224b10fd2092384b872 100644 (file)
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -34,7 +34,6 @@
 #define CONFIG_E500                    /* BOOKE e500 family */
 #define CONFIG_E500MC                  /* BOOKE e500mc family */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
-#define CONFIG_MPC85xx                 /* MPC85xx/PQ3 platform */
 #define CONFIG_MP                      /* support multiple processors */
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index fa89d13944159d2117782dcac71d2369774c9eac..a163e3d8f1d4a452f6cce3ce89880252dfd6c2c0 100644 (file)
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -55,7 +55,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE                   /* BOOKE */
 #define CONFIG_E500                    /* BOOKE e500 family */
-#define CONFIG_MPC85xx         /* MPC8540/60/55/41/48/P1020/P2020/P1010,etc*/
 #define CONFIG_FSL_IFC                 /* Enable IFC Support */
 
 #define CONFIG_FSL_LAW                 /* Use common FSL init code */

diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index a973a4914776c71a14a8138cbd6b33af27bc3051..052a0f11035375b6140671bf605415c3fa5ce521 100644 (file)
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -71,7 +71,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE                   /* BOOKE */
 #define CONFIG_E500                    /* BOOKE e500 family */
-#define CONFIG_MPC85xx
 #define CONFIG_FSL_IFC                 /* Enable IFC Support */
 #define CONFIG_SYS_HAS_SERDES          /* common SERDES init code */
 

diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 69ca0a13e4afa280029f6e6c90c05c81ba85599e..92913c8e79d159900f79fe75d5835aa28ff280a7 100644 (file)
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -87,7 +87,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE                   /* BOOKE */
 #define CONFIG_E500                    /* BOOKE e500 family */
-#define CONFIG_MPC85xx
 #define CONFIG_FSL_IFC                 /* Enable IFC Support */
 #define CONFIG_SYS_HAS_SERDES          /* common SERDES init code */
 

diff --git a/include/configs/HWW1U1A.h b/include/configs/HWW1U1A.h
index bbfee7d30854780d1ac7afd9217b26d225e8d8d8..6a3a11cb7f4c12b45fe2b2abca87420e00f44973 100644 (file)
--- a/include/configs/HWW1U1A.h
+++ b/include/configs/HWW1U1A.h
@@ -13,7 +13,6 @@
 /* High-level system configuration options */
 #define CONFIG_BOOKE           /* Power/PowerPC Book-E                 */
 #define CONFIG_E500            /* e500 (Power ISA v2.03 with SPE)      */
-#define CONFIG_MPC85xx         /* MPC8540/60/55/41/48 family           */
 #define CONFIG_FSL_ELBC                /* FreeScale Enhanced LocalBus Cntlr    */
 #define CONFIG_FSL_LAW         /* FreeScale Local Access Window        */
 #define CONFIG_P2020           /* FreeScale P2020                      */

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 9b7cc6474cfd96406595e444fa2f9f522ec1283a..57bf04ff816250a5205596f3d91650e36ce86a16 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -56,7 +56,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48 */
 #define CONFIG_MPC8536         1
 #define CONFIG_MPC8536DS       1
 

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index 2d42b25121d2a36b0a661c459c7a28fa2475752f..37c2b9415af9fb040d1c1f7410d97b688c7c40a7 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -21,7 +21,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/MPC8560 */
 #define CONFIG_MPC8540         1       /* MPC8540 specific */
 #define CONFIG_MPC8540ADS      1       /* MPC8540ADS board specific */
 

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index b9ad0342256b5ed901f512cba7339ec501b4d0bd..5d229a0d204611a2d23f94ea13c48cfcef356dac 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -16,7 +16,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41 */
 #define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_MPC8541         1       /* MPC8541 specific */
 #define CONFIG_MPC8541CDS      1       /* MPC8541CDS board specific */

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 90fc2da34b806f4b5bd55821079a231b878ec189..dade6d3b89cd18556c77adebec6597a73f3def3b 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -14,7 +14,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48 */
 #define CONFIG_MPC8544         1
 #define CONFIG_MPC8544DS       1
 

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 5fff1e2cac83b43a3d5da253142fd7ca62f9e181..190c668303a662533df6d625bd8cf914c1e01e6c 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -20,7 +20,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48 */
 #define CONFIG_MPC8548         1       /* MPC8548 specific */
 #define CONFIG_MPC8548CDS      1       /* MPC8548CDS board specific */
 

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 23c6b07c3593f45096d9c291ba426a0cb54309cd..5263ffcc8d6f32cfa1652731e407e541fbf40d5b 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -16,7 +16,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41 */
 #define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_MPC8555         1       /* MPC8555 specific */
 #define CONFIG_MPC8555CDS      1       /* MPC8555CDS board specific */

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 44b767919e2011664f15f449b5c491a1379627d3..ac78d481d68ce2980b652fc2b8ee3e00837e40e4 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -21,7 +21,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/MPC8560 */
 #define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_MPC8560ADS      1       /* MPC8560ADS board specific */
 #define CONFIG_MPC8560         1

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 4f438a807562eeb674e0c49af5c590052809d988..02a5acf38ea3fd533a286bef83365727d35d04e6 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -13,7 +13,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48/68 */
 #define CONFIG_MPC8568         1       /* MPC8568 specific */
 #define CONFIG_MPC8568MDS      1       /* MPC8568MDS board specific */
 

diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index d877e8bbd1812d8a94774fccf3fa06228e9e9122..33cadb93dd98e907152d921486b65423f5228a47 100644 (file)
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -13,7 +13,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48/68 */
 #define CONFIG_MPC8569         1       /* MPC8569 specific */
 #define CONFIG_MPC8569MDS      1       /* MPC8569MDS board specific */
 

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 44d83a236e846b5bc499035400fa7fa3b9338e17..f457719bf4f7999984e6257b6f3b8e0550a2979c 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -44,7 +44,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48 */
 #define CONFIG_MPC8572         1
 #define CONFIG_MPC8572DS       1
 #define CONFIG_MP              1       /* support multiple processors */

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 62d7a84f4c580a2e7cb62ae13f975e51a548d2fd..f82fbca77cfd2425b1e754a7274daca611de2a77 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -77,7 +77,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE                   /* BOOKE */
 #define CONFIG_E500                    /* BOOKE e500 family */
-#define CONFIG_MPC85xx
 #define CONFIG_FSL_IFC                 /* Enable IFC Support */
 #define CONFIG_SYS_HAS_SERDES          /* common SERDES init code */
 

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 9c9d72b6051c7993e99738fda54e6985cb88030e..6255b0ae4e6f2171a2be45918d903489847a1189 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -122,7 +122,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE                   /* BOOKE */
 #define CONFIG_E500                    /* BOOKE e500 family */
-#define CONFIG_MPC85xx                 /* MPC8540/60/55/41/48 */
 #define CONFIG_P1022
 #define CONFIG_P1022DS
 #define CONFIG_MP                      /* support multiple processors */

diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index 78a0aa2a7b8d7646b7321e03a1ae8a0cdada23bb..b41cb4a13efff2291d163f0befaf973997e762a7 100644 (file)
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -25,7 +25,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           /* BOOKE */
 #define CONFIG_E500            /* BOOKE e500 family */
-#define CONFIG_MPC85xx
 #define CONFIG_P1023
 #define CONFIG_MP              /* support multiple processors */
 

diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h
index d2aaf98113e9c6cfffdfbfa0e592ce4b51c292a8..b51354525a84c9737d010ff4b4b7c4c3c1733b9b 100644 (file)
--- a/include/configs/P1023RDS.h
+++ b/include/configs/P1023RDS.h
@@ -46,7 +46,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           /* BOOKE */
 #define CONFIG_E500            /* BOOKE e500 family */
-#define CONFIG_MPC85xx
 #define CONFIG_P1023
 #define CONFIG_P1023RDS
 #define CONFIG_MP              /* support multiple processors */

diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index 726014a563e86f6a9a3c55bff25469a3df3d0fa0..32ed0c2714c94f9dfd0694fa01e03092969186b1 100644 (file)
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -70,7 +70,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48/P1020/P2020,etc*/
 #define CONFIG_FSL_ELBC                1       /* Enable eLBC Support */
 
 #define CONFIG_PCI             1       /* Enable PCI/PCIE */

diff --git a/include/configs/P2020COME.h b/include/configs/P2020COME.h
index ce3c762559b9c77d13172cbbbedaf435e84688e4..d414b84dd21e4ee66a5a1574572122c896f03be6 100644 (file)
--- a/include/configs/P2020COME.h
+++ b/include/configs/P2020COME.h
@@ -29,7 +29,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48/P1020/P2020,etc*/
 #define CONFIG_P2020           1
 #define CONFIG_P2020COME       1
 #define CONFIG_FSL_ELBC                1       /* Enable eLBC Support */

diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index 7ef165e1525a9f5e078b116243c8a6f70f1369cb..3d0b5c2fbe374b7c0bd50c5229f5db4914e99709 100644 (file)
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -34,7 +34,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48 */
 #define CONFIG_P2020           1
 #define CONFIG_P2020DS         1
 #define CONFIG_MP              1       /* support multiple processors */

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 6934c616bb74fd4aa8c8df839955b70e9e1c110f..47c638422f54cb0491dba038d4b972ab515442c9 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -37,7 +37,6 @@
 #define CONFIG_E500                    /* BOOKE e500 family */
 #define CONFIG_E500MC                  /* BOOKE e500mc family */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
-#define CONFIG_MPC85xx                 /* MPC85xx/PQ3 platform */
 #define CONFIG_MP                      /* support multiple processors */
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 91b511bf5e4f0e2d04deb38e1be0f1fab29aa4b8..8234a828dda3a82a0096a80a54c17317ebdc22cc 100644 (file)
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -41,7 +41,6 @@
 #define CONFIG_E500                    /* BOOKE e500 family */
 #define CONFIG_E500MC                  /* BOOKE e500mc family */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
-#define CONFIG_MPC85xx                 /* MPC85xx/PQ3 platform */
 #define CONFIG_MP                      /* support multiple processors */
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/T1040RDB.h b/include/configs/T1040RDB.h
index 65b4b26a09e2b6fc259f718f75fa6f281f70055a..5e988c254c79236a07aa9e8220f7114567448915 100644 (file)
--- a/include/configs/T1040RDB.h
+++ b/include/configs/T1040RDB.h
@@ -40,7 +40,6 @@
 #define CONFIG_E500                    /* BOOKE e500 family */
 #define CONFIG_E500MC                  /* BOOKE e500mc family */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
-#define CONFIG_MPC85xx                 /* MPC85xx/PQ3 platform */
 #define CONFIG_MP                      /* support multiple processors */
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/T1042RDB_PI.h b/include/configs/T1042RDB_PI.h
index 104bb929efddef7ffcacb56006a69d40ecd21ec2..aafa8139b1ac6565622746bc6196a1d042d427da 100644 (file)
--- a/include/configs/T1042RDB_PI.h
+++ b/include/configs/T1042RDB_PI.h
@@ -40,7 +40,6 @@
 #define CONFIG_E500                    /* BOOKE e500 family */
 #define CONFIG_E500MC                  /* BOOKE e500mc family */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
-#define CONFIG_MPC85xx                 /* MPC85xx/PQ3 platform */
 #define CONFIG_MP                      /* support multiple processors */
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/T2080QDS.h b/include/configs/T2080QDS.h
index d6d1f936845f3f659b48d9e32296235b48a943ad..9bd0fe238204bd5790f1408ae2fc326e2698f337 100644 (file)
--- a/include/configs/T2080QDS.h
+++ b/include/configs/T2080QDS.h
@@ -27,7 +27,6 @@
 #define CONFIG_E500            /* BOOKE e500 family */
 #define CONFIG_E500MC          /* BOOKE e500mc family */
 #define CONFIG_SYS_BOOK3E_HV   /* Category E.HV supported */
-#define CONFIG_MPC85xx         /* MPC85xx/PQ3 platform */
 #define CONFIG_MP              /* support multiple processors */
 #define CONFIG_ENABLE_36BIT_PHYS
 

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 46d4f9865f3036a0a1183792f738c74569b9a162..868813f29b1f3e5d96437069dabd16bbdd676dd9 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -41,7 +41,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE                   /* BOOKE */
 #define CONFIG_E500                    /* BOOKE e500 family */
-#define CONFIG_MPC85xx                 /* MPC8540/60/55/41/48 */
 #define CONFIG_P1022
 #define CONFIG_CONTROLCENTERD
 #define CONFIG_MP                      /* support multiple processors */

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index fa748f71cb93e164a0a591a77ee20da679e308d0..72432e4bde5291779e74cecfe84956708b000b8a 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -45,7 +45,6 @@
 #define CONFIG_E500                    /* BOOKE e500 family */
 #define CONFIG_E500MC                  /* BOOKE e500mc family */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
-#define CONFIG_MPC85xx                 /* MPC85xx/PQ3 platform */
 #define CONFIG_MP                      /* support multiple processors */
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 0463fcbac7f292154d1552d4926f5fe2f6e710fc..2466649b15c7ce1d548a45a715d32d4b313b1a17 100644 (file)
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -32,7 +32,6 @@
 #define CONFIG_E500                    /* BOOKE e500 family */
 #define CONFIG_E500MC                  /* BOOKE e500mc family */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
-#define CONFIG_MPC85xx                 /* MPC85xx/PQ3 platform */
 #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 95e23ac58582c4e8548c905fb7cdaad87de7780d..117484da8726ac6e6301efc411468fca70debfe4 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -265,7 +265,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE
 #define CONFIG_E500
-#define CONFIG_MPC85xx
 
 #define CONFIG_MP
 

diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index a7fe90ff3b11fa28220267f525e81b3d78fcf2c8..601bac72e0a0a8cf6900ed607e339e900a60120a 100644 (file)
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -42,7 +42,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE
 #define CONFIG_E500
-#define CONFIG_MPC85xx
 
 #define CONFIG_MP
 

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 4912d69dcfee92c2b5d9d82fec5757b96f92a0f9..f28f350fcc86923545139a94501dfcbcde7e6246 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -38,7 +38,6 @@
  */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48 */
 #define CONFIG_MPC8548         1       /* MPC8548 specific */
 #define CONFIG_SBC8548         1       /* SBC8548 board specific */
 

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index fd590e4e122d0fa0f34af30d7e38228fb07833d0..c654a0e4ebc01bbb4f486e0c1cf977eb6342efff 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -25,7 +25,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE                        */
 #define CONFIG_E500            1       /* BOOKE e500 family            */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41             */
 #define CONFIG_MPC8544         1
 #define CONFIG_SOCRATES                1
 

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 2a9c9a349c074d1b5ac95cf14a1c85ef005330a1..5fb40ebf8ba534e791b02d79a596b4a12c7bc67b 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -22,7 +22,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE                */
 #define CONFIG_E500            1       /* BOOKE e500 family    */
-#define CONFIG_MPC85xx         1       /* MPC8540/MPC8560      */
 #define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_STXGP3          1       /* Silicon Tx GPPP board specific*/
 #define CONFIG_MPC8560         1

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index d0cb68a0ed5e7757880aba71ea9e55b54d846cb6..914d82190597110e9b2d23e01ba8c2ef10bb3085 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -22,7 +22,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE                */
 #define CONFIG_E500            1       /* BOOKE e500 family    */
-#define CONFIG_MPC85xx         1       /* MPC8540/MPC8560      */
 #define CONFIG_CPM2            1       /* has CPM2 */
 #define CONFIG_STXSSA          1       /* Silicon Tx GPPP SSA board specific*/
 #define CONFIG_MPC8560         1

diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index 74fef67f23d3745b34dac8dc29844b7e2be798d1..bd324ba2fa2f1cde3ad6354794a89ed91828b078 100644 (file)
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -17,7 +17,6 @@
 #define CONFIG_E500                    /* BOOKE e500 family */
 #define CONFIG_E500MC                  /* BOOKE e500mc family */
 #define CONFIG_SYS_BOOK3E_HV           /* Category E.HV supported */
-#define CONFIG_MPC85xx                 /* MPC85xx/PQ3 platform */
 #define CONFIG_MP                      /* support multiple processors */
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index f39d6f9105a38b8f6b777191277364d68a690c18..baa30395aaf5e95ff884cca5946a8012dbfc5d7e 100644 (file)
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -16,7 +16,6 @@
  */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48 */
 #define CONFIG_MPC8548         1
 #define CONFIG_XPEDITE5200     1
 #define CONFIG_SYS_BOARD_NAME  "XPedite5200"

diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index e1bdf90de4622aeb4fdf3fe9fb646c70465ba8b4..bdf55763d50c3655fdb34a723d7b8938a506669c 100644 (file)
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -16,7 +16,6 @@
  */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48 */
 #define CONFIG_MPC8572         1
 #define CONFIG_XPEDITE5370     1
 #define CONFIG_SYS_BOARD_NAME  "XPedite5370"

diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 2328c7a62ed620918ecab0d393fb7e3f7a438358..0b24f3e8d7938df4b249c3e66ef11b7abc69fe79 100644 (file)
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -16,7 +16,6 @@
  */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC85xx         1       /* MPC8540/60/55/41/48 */
 #define CONFIG_P2020           1
 #define CONFIG_XPEDITE550X     1
 #define CONFIG_SYS_BOARD_NAME  "XPedite5500"