powerpc: mpc5xxx: remove redundant CONFIG_MPC5xxx definition

We do not have to define CONFIG_MPC5xxx in board config headers
(and start.S) because it is defined in arch/powerpc/cpu/mpc5xxx/config.mk.

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

diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S
index 84ab41e931eeee04f5ff24f995b357260097b018..02c706ec63d2ea95df5108883fee237c63708f9d 100644 (file)
--- a/arch/powerpc/cpu/mpc5xxx/start.S
+++ b/arch/powerpc/cpu/mpc5xxx/start.S
@@ -14,8 +14,6 @@
 #include <mpc5xxx.h>
 #include <version.h>
 
-#define CONFIG_MPC5xxx 1       /* needed for Linux kernel header files */
-
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
 

diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 377db7be9a58967828c2f8307d45daf5f256c1e8..802e9cce1fb61e3ac50c2844bb4417e02d905bfa 100644 (file)
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -22,8 +22,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU           */
-#define CONFIG_MPC5200         1       /* (more precisely a MPC5200 CPU)   */
+#define CONFIG_MPC5200         1       /* This is a MPC5200 CPU            */
 #define CONFIG_TQM5200         1       /* ... on a TQM5200 module          */
 
 #define CONFIG_BC3450          1       /* ... on a BC3450 mainboard        */

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 52368f8ea0152196923ed81f6d62a14cc766b6eb..1861aa86d9be3a33afa4216d781b58a361f45a90 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -13,8 +13,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely a MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is a MPC5200 CPU */
 #define CONFIG_ICECUBE         1       /* ... on IceCube board */
 
 /*

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 9d49de7c61d21a25fc518394151f5ceb0987b88e..99e4e9051fc6adafd2ea2659bd9766256499213b 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -13,7 +13,6 @@
 
 #include <version.h>
 
-#define CONFIG_MPC5xxx 1
 #define CONFIG_MPC5200         1
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index f69b9a856c61be82be0a99e4839ba59ab21ded34..bb565b602e877603c39543d221d0b693e6d68041 100644 (file)
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -13,7 +13,6 @@
 
 #include <version.h>
 
-#define CONFIG_MPC5xxx 1
 #define CONFIG_MPC5200         1
 
 #ifndef CONFIG_SYS_TEXT_BASE

diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 557a8bad7ed5c7911c76a105f424699a1fa25b73..de46216422fbbc08691c326f40df1d73ea8627ea 100644 (file)
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -14,8 +14,7 @@
  */
 
 #define CONFIG_MPC5200
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_PM520           1       /* ... on PM520 board */
+#define CONFIG_PM520           1       /* PM520 board */
 
 #define        CONFIG_SYS_TEXT_BASE    0xfff00000
 

diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index 90f7fc4d792ad490500125a65bb0d75fc81c81de..b4daedceea9918c4e27c648d4972389b63a372a0 100644 (file)
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -16,8 +16,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_TQM5200         1       /* ... on TQM5200 module */
 #define CONFIG_TB5200          1       /* ... on a TB5200 base board */
 

diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 7aba00914d5512f61bd94422380f3abd2dc35430..92128b95884247dcdb2516d97aad227f6a55a109 100644 (file)
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -25,8 +25,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* More exactly a MPC5200 */
+#define CONFIG_MPC5200         1       /* This is a MPC5200 CPU */
 #define CONFIG_TOP5200         1       /* ... on TOP5200 board - we need this for FEC.C */
 
 /*

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 13500ee1390c605f1a9c788ca776bcc0d1e4d15c..69c0336caee61093557d42b798b3186b823b234b 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -16,8 +16,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU               */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU)      */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU               */
 #define CONFIG_TQM5200         1       /* ... on TQM5200 module                */
 #undef CONFIG_TQM5200_REV100           /*  define for revision 100 modules     */
 

diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index acc4fdc6680d41eb63f7f475c82113b19e8a714b..a58eecab846ae3b130b3254bcd63ce695b95d25b 100644 (file)
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -24,8 +24,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely a MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is a MPC5200 CPU */
 #define CONFIG_TOTAL5200       1       /* ... on Total5200 board */
 
 /*

diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index d151869d7bf08cfe3a7f002ff5991544af21eff5..1e65cd1465ea8f9009d671c12eeb66ef76990fac 100644 (file)
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -13,8 +13,7 @@
  */
 
 #define CONFIG_MPC5200
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_A3M071                  /* ... on A3M071 board */
+#define CONFIG_A3M071                  /* A3M071 board */
 
 #define        CONFIG_SYS_TEXT_BASE    0x01000000      /* boot low for 32 MiB boards */
 

diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index 64737020f52fddf4b89eecd2e668dcf9f49dbbcc..cc88ac1618a3c4b7bed4806120274cb3466d3419 100644 (file)
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -16,8 +16,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely a MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is a MPC5200 CPU */
 #define CONFIG_A4M072          1       /* ... on A4M072 board */
 #define CONFIG_MPC5200_DDR     1       /* ... use DDR RAM */
 

diff --git a/include/configs/aev.h b/include/configs/aev.h
index 0eafb3ca74fdbbc64f99bedc93d52a3c7463d932..2dffcfbed33204c7b75a55379afcf66b4da49280 100644 (file)
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -16,8 +16,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_TQM5200         1       /* ... on TQM5200 module */
 #undef CONFIG_TQM5200_REV100           /*  define for revision 100 modules */
 #define CONFIG_STK52XX         1       /* ... on a STK52XX base board */

diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index d929bde8f21115bebc7c0edbe099f2d65852c06e..c90179380f838e951df02956efb14267f9db074a 100644 (file)
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -13,8 +13,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* More exactly a MPC5200 */
+#define CONFIG_MPC5200         1       /* This is a MPC5200 CPU */
 #define CONFIG_CANMB           1       /* ... on canmb board - we need this for FEC.C */
 
 /*

diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index ac3d6bd3437f26859ee80d41b60ac3397fc041e9..7c693d62d1d3ad948ab6dc3212c20a2dd7f4afb9 100644 (file)
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -11,8 +11,7 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_CM5200          1       /* ... on CM5200 platform */
 
 #define        CONFIG_SYS_TEXT_BASE    0xfc000000

diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index db5ceadba68cf43b8ce22c84a200a582802c9198..ec926fd22d5f9c0294f1fd3bc38db8a591b38656 100644 (file)
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -23,8 +23,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5200         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_ICECUBE         1       /* ... on IceCube board   */
 #define CONFIG_CPCI5200                1       /* ... on CPCI5200  board */
 #define CONFIG_MPC5200_DDR     1       /* ... use DDR RAM        */

diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h
index bc5853eb5c2724954a4779f4d70bb133d8436ca2..2a8cb3940b68ec9dd37b1ecd59686faaa2b929af 100644 (file)
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@@ -20,8 +20,7 @@
  * High Level Configuration Options
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_DIGSY_MTC       1       /* ... on InterControl digsyMTC board */
 
 /*

diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index 560363d237a94cb26886991e5144709ddb89f729..b555d82ddc066d5c1554856ebddf2938585aed87 100644 (file)
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -23,8 +23,7 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_SYS_MPC5XXX_CLKIN 33333333      /* ... running at 33.333333MHz */
 
 /*

diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 1c74a2e96e93c8abb614a6471a9516b5f92f8d01..a1a88b5e33028d7b3d3803e02fc3ef6f36ed29cb 100644 (file)
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -13,9 +13,8 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU               */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU)      */
-#define CONFIG_HMI1001         1       /* HMI1001 board                        */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU       */
+#define CONFIG_HMI1001         1       /* HMI1001 board                */
 
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE   0xFFF00000

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 608d7592f13359ef1312efc33e408274724ab5da..f321975c478d681472ee0554d9f98ae95ed4caca 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -16,9 +16,8 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU               */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU)      */
-#define CONFIG_INKA4X0         1       /* INKA4x0 board                        */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU       */
+#define CONFIG_INKA4X0         1       /* INKA4x0 board                */
 
 /*
  * Valid values for CONFIG_SYS_TEXT_BASE are:

diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index 408168b9bccdc889edf0f624f28b91ae15a7fcbb..41ced15c489ce3dd7111879211b1f32ae0760313 100644 (file)
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -16,9 +16,8 @@
  */
 
 #define CONFIG_MPC5200
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPX5200         1       /* ... on MPX5200 board */
-#define CONFIG_MPC5200_DDR     1       /* ... use DDR RAM */
+#define CONFIG_MPX5200         1       /* MPX5200 board */
+#define CONFIG_MPC5200_DDR     1       /* use DDR RAM */
 #define CONFIG_IPEK01                  /* Motherboard is ipek01 */
 
 #define        CONFIG_SYS_TEXT_BASE    0xfc000000

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 71e8ececfcac7271a983175af87a49519cdb9bc4..7dfaa221ee6efd74d13427307e24038e367371e0 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -13,8 +13,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* especially an MPC5200 */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_JUPITER         1       /* ... on Jupiter board */
 
 /*

diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h
index 21b17f6e2cf3801c5ce6bd11919f67cc97c50e2f..60e8716a7905250ab6b981ea654c5acf3dbbd354 100644 (file)
--- a/include/configs/manroland/mpc5200-common.h
+++ b/include/configs/manroland/mpc5200-common.h
@@ -12,8 +12,7 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU               */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU)      */
+#define CONFIG_MPC5200         1       /* MPC5200 CPU */
 
 #define CONFIG_SYS_MPC5XXX_CLKIN       33000000 /* ... running at 33.000000MHz */
 

diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index 1b9e2d0f90c9e9ae0a0fcad308cca169f0348cb7..a317782dbe23774e77116fd2c787cd6731148ba7 100644 (file)
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -14,8 +14,7 @@
  */
 
 #define CONFIG_MPC5200
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU               */
-#define CONFIG_MCC200          1       /* ... on MCC200 board                  */
+#define CONFIG_MCC200          1       /* MCC200 board */
 
 /*
  * Valid values for CONFIG_SYS_TEXT_BASE are:

diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 047e1711005171829058f189831abc920c03fe41..b270429dd821875253f44e4329410f171421f2f0 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -23,8 +23,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5200         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_ICECUBE         1       /* ... on IceCube board */
 #define CONFIG_MECP5200                1       /* ... on MECP5200  board */
 #define CONFIG_MPC5200_DDR      1       /* ... use DDR RAM      */

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 8071ac3808e2e436438f1a45dcf49f66036c26d8..e8b05932a13a847ee329181292c11927b6521262 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -15,8 +15,7 @@
  */
 
 /* CPU and board */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* More exactly a MPC5200 */
+#define CONFIG_MPC5200         1       /* This is a MPC5200 CPU */
 #define CONFIG_MOTIONPRO       1       /* ... on Promess Motion-PRO board */
 
 #define CONFIG_HIGH_BATS       1       /* High BATs supported */

diff --git a/include/configs/munices.h b/include/configs/munices.h
index 3bda8ebea4187db7862a474de92e3d84c670f4d0..e65a14af2340506edc16fabbeeb3a69efecc54a8 100644 (file)
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -11,8 +11,7 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_MPC5200_DDR     1       /* (with DDR-SDRAM) */
 #define CONFIG_MUNICES         1       /* ... on MUNICes board */
 

diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h
index ce08454994beaf4b3c389446295478212382c511..18714eae1e99ebea0378afe326db053d9496ecba 100644 (file)
--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@@ -16,7 +16,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
 #define CONFIG_MPC5200
 
 #define CONFIG_SYS_MPC5XXX_CLKIN       33000000 /* running at 33.000000MHz */

diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h
index 5c6188955d6a98bf184aed5b6091815791da012b..31a93c87de8bbc5f4e5983068f2691d150a45cc7 100644 (file)
--- a/include/configs/pcm030.h
+++ b/include/configs/pcm030.h
@@ -20,8 +20,7 @@
 High Level Configuration Options
 (easy to change)
 -----------------------------------------------------------------------------*/
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_MPC5200_DDR     1       /* (with DDR-SDRAM) */
 #define CONFIG_PHYCORE_MPC5200B_TINY 1 /* phyCORE-MPC5200B -> */
                                        /* FEC configuration and IDE */

diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index 327be3fde942c1202075fcf0085ea8b12c2f8a99..be76478c30c1a48714904aefbb9e25708cc5f77c 100644 (file)
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -22,8 +22,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5200         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_ICECUBE         1       /* ... on IceCube board */
 #define CONFIG_PF5200          1       /* ... on PF5200  board */
 #define CONFIG_MPC5200_DDR     1       /* ... use DDR RAM      */

diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 0c544350ebf45ea35112227d6807aebf1bf95fd9..7f6b0c7cb2650e7675150dabe1f0792b3eb2336c 100644 (file)
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -12,7 +12,6 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MPC5xxx                 1       /* This is an MPC5xxx CPU */
 #define CONFIG_MPC5200                 1       /* This is an MPC5200 CPU */
 #define CONFIG_V38B                    1       /* ...on V38B board */