powerpc: mpc5xxx: remove redundant CONFIG_MPC5xxx definition

PATCH New Masahiro Yamada 2 participants 2 messages Jan 16, 2014 – Jan 27, 2014 PowerPC

Share & tools

Masahiro Yamada

author

2014-01-16 02:03 UTC #0 lore raw

PATCH v3 1/1 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 <[email protected]>

---

Changes in v3:
- Change also the comments following the deleted lines

Changes in v2:
- Fix a typo in the subject: s/redandant/redundant/

 arch/powerpc/cpu/mpc5xxx/start.S           | 2 --
 include/configs/BC3450.h                   | 3 +--
 include/configs/IceCube.h                  | 3 +--
 include/configs/MVBC_P.h                   | 1 -
 include/configs/MVSMR.h                    | 1 -
 include/configs/PM520.h                    | 3 +--
 include/configs/TB5200.h                   | 3 +--
 include/configs/TOP5200.h                  | 3 +--
 include/configs/TQM5200.h                  | 3 +--
 include/configs/Total5200.h                | 3 +--
 include/configs/a3m071.h                   | 3 +--
 include/configs/a4m072.h                   | 3 +--
 include/configs/aev.h                      | 3 +--
 include/configs/canmb.h                    | 3 +--
 include/configs/cm5200.h                   | 3 +--
 include/configs/cpci5200.h                 | 3 +--
 include/configs/digsy_mtc.h                | 3 +--
 include/configs/galaxy5200.h               | 3 +--
 include/configs/hmi1001.h                  | 5 ++---
 include/configs/inka4x0.h                  | 5 ++---
 include/configs/ipek01.h                   | 5 ++---
 include/configs/jupiter.h                  | 3 +--
 include/configs/manroland/mpc5200-common.h | 3 +--
 include/configs/mcc200.h                   | 3 +--
 include/configs/mecp5200.h                 | 3 +--
 include/configs/motionpro.h                | 3 +--
 include/configs/munices.h                  | 3 +--
 include/configs/o2dnt-common.h             | 1 -
 include/configs/pcm030.h                   | 3 +--
 include/configs/pf5200.h                   | 3 +--
 include/configs/v38b.h                     | 1 -
 31 files changed, 29 insertions(+), 61 deletions(-)

arch/powerpc/cpu/mpc5xxx/start.S +0 -2

index 84ab41e..02c706e 100644
@@ -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>

include/configs/BC3450.h +1 -2

index 377db7b..802e9cc 100644
@@ -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	    */

include/configs/IceCube.h +1 -2

index 52368f8..1861aa8 100644
@@ -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 */
 
 /*

include/configs/MVBC_P.h +0 -1

index 9d49de7..99e4e90 100644
@@ -13,7 +13,6 @@
 
 #include <version.h>
 
-#define CONFIG_MPC5xxx	1
 #define CONFIG_MPC5200 	1
 
 #ifndef CONFIG_SYS_TEXT_BASE

include/configs/MVSMR.h +0 -1

index f69b9a8..bb565b6 100644
@@ -13,7 +13,6 @@
 
 #include <version.h>
 
-#define CONFIG_MPC5xxx	1
 #define CONFIG_MPC5200 	1
 
 #ifndef CONFIG_SYS_TEXT_BASE

include/configs/PM520.h +1 -2

index 557a8ba..de46216 100644
@@ -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

include/configs/TB5200.h +1 -2

index 90f7fc4..b4daedc 100644
@@ -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 */

include/configs/TOP5200.h +1 -2

index 7aba009..92128b9 100644
@@ -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 */
 
 /*

include/configs/TQM5200.h +1 -2

index 13500ee..69c0336 100644
@@ -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	*/

include/configs/Total5200.h +1 -2

index acc4fdc..a58eeca 100644
@@ -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 */
 
 /*

include/configs/a3m071.h +1 -2

index d151869..1e65cd1 100644
@@ -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 */

include/configs/a4m072.h +1 -2

index 6473702..cc88ac1 100644
@@ -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 */

include/configs/aev.h +1 -2

index 0eafb3c..2dffcfb 100644
@@ -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 */

include/configs/canmb.h +1 -2

index d929bde..c901793 100644
@@ -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 */
 
 /*

include/configs/cm5200.h +1 -2

index ac3d6bd..7c693d6 100644
@@ -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

include/configs/cpci5200.h +1 -2

index db5cead..ec926fd 100644
@@ -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	  */

include/configs/digsy_mtc.h +1 -2

index bc5853e..2a8cb39 100644
@@ -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 */
 
 /*

include/configs/galaxy5200.h +1 -2

index 560363d..b555d82 100644
@@ -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 */
 
 /*

include/configs/hmi1001.h +2 -3

index 1c74a2e..a1a88b5 100644
@@ -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

include/configs/inka4x0.h +2 -3

index 608d759..f321975 100644
@@ -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:

include/configs/ipek01.h +2 -3

index 408168b..41ced15 100644
@@ -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

include/configs/jupiter.h +1 -2

index 71e8ece..7dfaa22 100644
@@ -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 */
 
 /*

include/configs/manroland/mpc5200-common.h +1 -2

index 21b17f6..60e8716 100644
@@ -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	*/

include/configs/mcc200.h +1 -2

index 1b9e2d0..a317782 100644
@@ -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:

include/configs/mecp5200.h +1 -2

index 047e171..b270429 100644
@@ -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      */

include/configs/motionpro.h +1 -2

index 8071ac3..e8b0593 100644
@@ -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 */

include/configs/munices.h +1 -2

index 3bda8eb..e65a14a 100644
@@ -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 */

include/configs/o2dnt-common.h +0 -1

index ce08454..18714ea 100644
@@ -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 */

include/configs/pcm030.h +1 -2

index 5c61889..31a93c8 100644
@@ -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 */

include/configs/pf5200.h +1 -2

index 327be3f..be76478 100644
@@ -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	*/

include/configs/v38b.h +0 -1

index 0c54435..7f6b0c7 100644
@@ -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 */

Signature · 1 line

1.8.3.2

Tom Rini

2014-01-27 14:56 UTC #1 lore raw

PATCH v3 1/1 powerpc: mpc5xxx: remove redundant CONFIG_MPC5xxx definition

Quoted 4 lines · Masahiro Yamada

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 <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140127/283ff9bb/attachment.pgp>