GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc: mpc5xxx: remove redundant CONFIG_MPC5xxx definition

Browse source 
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>
This commit is contained in:
Masahiro Yamada 2014-01-16 11:03:07 +09:00 • committed by Tom Rini
parent bc0009ebc6
commit b2a6dfe4f8
31 changed files with 29 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/cpu/mpc5xxx/start.S
View file

@ -14,8 +14,6 @@
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <version.h> #include <version.h>
#define CONFIG_MPC5xxx 1 /* needed for Linux kernel header files */
#include <ppc_asm.tmpl> #include <ppc_asm.tmpl>
#include <ppc_defs.h> #include <ppc_defs.h>

3
include/configs/BC3450.h
View file

@ -22,8 +22,7 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */
#define CONFIG_TQM5200 1 /* ... on a TQM5200 module */ #define CONFIG_TQM5200 1 /* ... on a TQM5200 module */
#define CONFIG_BC3450 1 /* ... on a BC3450 mainboard */ #define CONFIG_BC3450 1 /* ... on a BC3450 mainboard */

3
include/configs/IceCube.h
View file

@ -13,8 +13,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */
#define CONFIG_ICECUBE 1 /* ... on IceCube board */ #define CONFIG_ICECUBE 1 /* ... on IceCube board */
/* /*

1
include/configs/MVBC_P.h
View file

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

1
include/configs/MVSMR.h
View file

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

3
include/configs/PM520.h
View file

@ -14,8 +14,7 @@
*/ */
#define CONFIG_MPC5200 #define CONFIG_MPC5200
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_PM520 1 /* PM520 board */
#define CONFIG_PM520 1 /* ... on PM520 board */
#define CONFIG_SYS_TEXT_BASE 0xfff00000 #define CONFIG_SYS_TEXT_BASE 0xfff00000

3
include/configs/TB5200.h
View file

@ -16,8 +16,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_TQM5200 1 /* ... on TQM5200 module */ #define CONFIG_TQM5200 1 /* ... on TQM5200 module */
#define CONFIG_TB5200 1 /* ... on a TB5200 base board */ #define CONFIG_TB5200 1 /* ... on a TB5200 base board */

3
include/configs/TOP5200.h
View file

@ -25,8 +25,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
#define CONFIG_MPC5200 1 /* More exactly a MPC5200 */
#define CONFIG_TOP5200 1 /* ... on TOP5200 board - we need this for FEC.C */ #define CONFIG_TOP5200 1 /* ... on TOP5200 board - we need this for FEC.C */
/* /*

3
include/configs/TQM5200.h
View file

@ -16,8 +16,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_TQM5200 1 /* ... on TQM5200 module */ #define CONFIG_TQM5200 1 /* ... on TQM5200 module */
#undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */ #undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */

3
include/configs/Total5200.h
View file

@ -24,8 +24,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */
#define CONFIG_TOTAL5200 1 /* ... on Total5200 board */ #define CONFIG_TOTAL5200 1 /* ... on Total5200 board */
/* /*

3
include/configs/a3m071.h
View file

@ -13,8 +13,7 @@
*/ */
#define CONFIG_MPC5200 #define CONFIG_MPC5200
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_A3M071 /* A3M071 board */
#define CONFIG_A3M071 /* ... on A3M071 board */
#define CONFIG_SYS_TEXT_BASE 0x01000000 /* boot low for 32 MiB boards */ #define CONFIG_SYS_TEXT_BASE 0x01000000 /* boot low for 32 MiB boards */

3
include/configs/a4m072.h
View file

@ -16,8 +16,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */
#define CONFIG_A4M072 1 /* ... on A4M072 board */ #define CONFIG_A4M072 1 /* ... on A4M072 board */
#define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */

3
include/configs/aev.h
View file

@ -16,8 +16,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_TQM5200 1 /* ... on TQM5200 module */ #define CONFIG_TQM5200 1 /* ... on TQM5200 module */
#undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */ #undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */
#define CONFIG_STK52XX 1 /* ... on a STK52XX base board */ #define CONFIG_STK52XX 1 /* ... on a STK52XX base board */

3
include/configs/canmb.h
View file

@ -13,8 +13,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
#define CONFIG_MPC5200 1 /* More exactly a MPC5200 */
#define CONFIG_CANMB 1 /* ... on canmb board - we need this for FEC.C */ #define CONFIG_CANMB 1 /* ... on canmb board - we need this for FEC.C */
/* /*

3
include/configs/cm5200.h
View file

@ -11,8 +11,7 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_CM5200 1 /* ... on CM5200 platform */ #define CONFIG_CM5200 1 /* ... on CM5200 platform */
#define CONFIG_SYS_TEXT_BASE 0xfc000000 #define CONFIG_SYS_TEXT_BASE 0xfc000000

3
include/configs/cpci5200.h
View file

@ -23,8 +23,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5200 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
#define CONFIG_ICECUBE 1 /* ... on IceCube board */ #define CONFIG_ICECUBE 1 /* ... on IceCube board */
#define CONFIG_CPCI5200 1 /* ... on CPCI5200 board */ #define CONFIG_CPCI5200 1 /* ... on CPCI5200 board */
#define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */

3
include/configs/digsy_mtc.h
View file

@ -20,8 +20,7 @@
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_DIGSY_MTC 1 /* ... on InterControl digsyMTC board */ #define CONFIG_DIGSY_MTC 1 /* ... on InterControl digsyMTC board */
/* /*

3
include/configs/galaxy5200.h
View file

@ -23,8 +23,7 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */ #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */
/* /*

5
include/configs/hmi1001.h
View file

@ -13,9 +13,8 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_HMI1001 1 /* HMI1001 board */
#define CONFIG_HMI1001 1 /* HMI1001 board */
#ifndef CONFIG_SYS_TEXT_BASE #ifndef CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_TEXT_BASE 0xFFF00000 #define CONFIG_SYS_TEXT_BASE 0xFFF00000

5
include/configs/inka4x0.h
View file

@ -16,9 +16,8 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */ #define CONFIG_INKA4X0 1 /* INKA4x0 board */
#define CONFIG_INKA4X0 1 /* INKA4x0 board */
/* /*
* Valid values for CONFIG_SYS_TEXT_BASE are: * Valid values for CONFIG_SYS_TEXT_BASE are:

5
include/configs/ipek01.h
View file

@ -16,9 +16,8 @@
*/ */
#define CONFIG_MPC5200 #define CONFIG_MPC5200
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPX5200 1 /* MPX5200 board */
#define CONFIG_MPX5200 1 /* ... on MPX5200 board */ #define CONFIG_MPC5200_DDR 1 /* use DDR RAM */
#define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */
#define CONFIG_IPEK01 /* Motherboard is ipek01 */ #define CONFIG_IPEK01 /* Motherboard is ipek01 */
#define CONFIG_SYS_TEXT_BASE 0xfc000000 #define CONFIG_SYS_TEXT_BASE 0xfc000000

3
include/configs/jupiter.h
View file

@ -13,8 +13,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* especially an MPC5200 */
#define CONFIG_JUPITER 1 /* ... on Jupiter board */ #define CONFIG_JUPITER 1 /* ... on Jupiter board */
/* /*

3
include/configs/manroland/mpc5200-common.h
View file

@ -12,8 +12,7 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */

3
include/configs/mcc200.h
View file

@ -14,8 +14,7 @@
*/ */
#define CONFIG_MPC5200 #define CONFIG_MPC5200
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MCC200 1 /* MCC200 board */
#define CONFIG_MCC200 1 /* ... on MCC200 board */
/* /*
* Valid values for CONFIG_SYS_TEXT_BASE are: * Valid values for CONFIG_SYS_TEXT_BASE are:

3
include/configs/mecp5200.h
View file

@ -23,8 +23,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5200 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
#define CONFIG_ICECUBE 1 /* ... on IceCube board */ #define CONFIG_ICECUBE 1 /* ... on IceCube board */
#define CONFIG_MECP5200 1 /* ... on MECP5200 board */ #define CONFIG_MECP5200 1 /* ... on MECP5200 board */
#define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */

3
include/configs/motionpro.h
View file

@ -15,8 +15,7 @@
*/ */
/* CPU and board */ /* CPU and board */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
#define CONFIG_MPC5200 1 /* More exactly a MPC5200 */
#define CONFIG_MOTIONPRO 1 /* ... on Promess Motion-PRO board */ #define CONFIG_MOTIONPRO 1 /* ... on Promess Motion-PRO board */
#define CONFIG_HIGH_BATS 1 /* High BATs supported */ #define CONFIG_HIGH_BATS 1 /* High BATs supported */

3
include/configs/munices.h
View file

@ -11,8 +11,7 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */ #define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */
#define CONFIG_MUNICES 1 /* ... on MUNICes board */ #define CONFIG_MUNICES 1 /* ... on MUNICes board */

1
include/configs/o2dnt-common.h
View file

@ -16,7 +16,6 @@
/* /*
* High Level Configuration Options * High Level Configuration Options
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
#define CONFIG_MPC5200 #define CONFIG_MPC5200
#define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* running at 33.000000MHz */ #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* running at 33.000000MHz */

3
include/configs/pcm030.h
View file

@ -20,8 +20,7 @@
High Level Configuration Options High Level Configuration Options
(easy to change) (easy to change)
-----------------------------------------------------------------------------*/ -----------------------------------------------------------------------------*/
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
#define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */ #define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */
#define CONFIG_PHYCORE_MPC5200B_TINY 1 /* phyCORE-MPC5200B -> */ #define CONFIG_PHYCORE_MPC5200B_TINY 1 /* phyCORE-MPC5200B -> */
/* FEC configuration and IDE */ /* FEC configuration and IDE */

3
include/configs/pf5200.h
View file

@ -22,8 +22,7 @@
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5200 1 /* This is an MPC5xxx CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
#define CONFIG_ICECUBE 1 /* ... on IceCube board */ #define CONFIG_ICECUBE 1 /* ... on IceCube board */
#define CONFIG_PF5200 1 /* ... on PF5200 board */ #define CONFIG_PF5200 1 /* ... on PF5200 board */
#define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */

1
include/configs/v38b.h
View file

@ -12,7 +12,6 @@
* High Level Configuration Options * High Level Configuration Options
* (easy to change) * (easy to change)
*/ */
#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */ #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
#define CONFIG_V38B 1 /* ...on V38B board */ #define CONFIG_V38B 1 /* ...on V38B board */