Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b2a6dfe4f8d263b9aa45929f1a40cd1143775a81

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent bc0009ebc6
Exists in master and in 49 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 31 changed files with 29 additions and 61 deletions Side-by-side Diff

arch/powerpc/cpu/mpc5xxx/start.S
Diff comments   View file @ b2a6dfe
... ... @@ -14,8 +14,6 @@
14 14 #include <mpc5xxx.h>
15 15 #include <version.h>
16 16  
17   -#define CONFIG_MPC5xxx 1 /* needed for Linux kernel header files */
18   -
19 17 #include <ppc_asm.tmpl>
20 18 #include <ppc_defs.h>
21 19  
include/configs/BC3450.h
Diff comments   View file @ b2a6dfe
... ... @@ -22,8 +22,7 @@
22 22 /*
23 23 * High Level Configuration Options
24 24 */
25   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
26   -#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */
  25 +#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
27 26 #define CONFIG_TQM5200 1 /* ... on a TQM5200 module */
28 27  
29 28 #define CONFIG_BC3450 1 /* ... on a BC3450 mainboard */
include/configs/IceCube.h
Diff comments   View file @ b2a6dfe
... ... @@ -13,8 +13,7 @@
13 13 * (easy to change)
14 14 */
15 15  
16   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
17   -#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */
  16 +#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
18 17 #define CONFIG_ICECUBE 1 /* ... on IceCube board */
19 18  
20 19 /*
include/configs/MVBC_P.h
Diff comments   View file @ b2a6dfe
... ... @@ -13,7 +13,6 @@
13 13  
14 14 #include <version.h>
15 15  
16   -#define CONFIG_MPC5xxx 1
17 16 #define CONFIG_MPC5200 1
18 17  
19 18 #ifndef CONFIG_SYS_TEXT_BASE
include/configs/MVSMR.h
Diff comments   View file @ b2a6dfe
... ... @@ -13,7 +13,6 @@
13 13  
14 14 #include <version.h>
15 15  
16   -#define CONFIG_MPC5xxx 1
17 16 #define CONFIG_MPC5200 1
18 17  
19 18 #ifndef CONFIG_SYS_TEXT_BASE
include/configs/PM520.h
Diff comments   View file @ b2a6dfe
... ... @@ -14,8 +14,7 @@
14 14 */
15 15  
16 16 #define CONFIG_MPC5200
17   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
18   -#define CONFIG_PM520 1 /* ... on PM520 board */
  17 +#define CONFIG_PM520 1 /* PM520 board */
19 18  
20 19 #define CONFIG_SYS_TEXT_BASE 0xfff00000
21 20  
include/configs/TB5200.h
Diff comments   View file @ b2a6dfe
... ... @@ -16,8 +16,7 @@
16 16 * (easy to change)
17 17 */
18 18  
19   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
20   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
  19 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
21 20 #define CONFIG_TQM5200 1 /* ... on TQM5200 module */
22 21 #define CONFIG_TB5200 1 /* ... on a TB5200 base board */
23 22  
include/configs/TOP5200.h
Diff comments   View file @ b2a6dfe
... ... @@ -25,8 +25,7 @@
25 25 * (easy to change)
26 26 */
27 27  
28   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
29   -#define CONFIG_MPC5200 1 /* More exactly a MPC5200 */
  28 +#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
30 29 #define CONFIG_TOP5200 1 /* ... on TOP5200 board - we need this for FEC.C */
31 30  
32 31 /*
include/configs/TQM5200.h
Diff comments   View file @ b2a6dfe
... ... @@ -16,8 +16,7 @@
16 16 * (easy to change)
17 17 */
18 18  
19   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
20   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
  19 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
21 20 #define CONFIG_TQM5200 1 /* ... on TQM5200 module */
22 21 #undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */
23 22  
include/configs/Total5200.h
Diff comments   View file @ b2a6dfe
... ... @@ -24,8 +24,7 @@
24 24 * (easy to change)
25 25 */
26 26  
27   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
28   -#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */
  27 +#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
29 28 #define CONFIG_TOTAL5200 1 /* ... on Total5200 board */
30 29  
31 30 /*
include/configs/a3m071.h
Diff comments   View file @ b2a6dfe
... ... @@ -13,8 +13,7 @@
13 13 */
14 14  
15 15 #define CONFIG_MPC5200
16   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
17   -#define CONFIG_A3M071 /* ... on A3M071 board */
  16 +#define CONFIG_A3M071 /* A3M071 board */
18 17  
19 18 #define CONFIG_SYS_TEXT_BASE 0x01000000 /* boot low for 32 MiB boards */
20 19  
include/configs/a4m072.h
Diff comments   View file @ b2a6dfe
... ... @@ -16,8 +16,7 @@
16 16 * (easy to change)
17 17 */
18 18  
19   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
20   -#define CONFIG_MPC5200 1 /* (more precisely a MPC5200 CPU) */
  19 +#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
21 20 #define CONFIG_A4M072 1 /* ... on A4M072 board */
22 21 #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */
23 22  
include/configs/aev.h
Diff comments   View file @ b2a6dfe
... ... @@ -16,8 +16,7 @@
16 16 * (easy to change)
17 17 */
18 18  
19   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
20   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
  19 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
21 20 #define CONFIG_TQM5200 1 /* ... on TQM5200 module */
22 21 #undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */
23 22 #define CONFIG_STK52XX 1 /* ... on a STK52XX base board */
include/configs/canmb.h
Diff comments   View file @ b2a6dfe
... ... @@ -13,8 +13,7 @@
13 13 * (easy to change)
14 14 */
15 15  
16   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
17   -#define CONFIG_MPC5200 1 /* More exactly a MPC5200 */
  16 +#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
18 17 #define CONFIG_CANMB 1 /* ... on canmb board - we need this for FEC.C */
19 18  
20 19 /*
include/configs/cm5200.h
Diff comments   View file @ b2a6dfe
... ... @@ -11,8 +11,7 @@
11 11 /*
12 12 * High Level Configuration Options
13 13 */
14   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
15   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
  14 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
16 15 #define CONFIG_CM5200 1 /* ... on CM5200 platform */
17 16  
18 17 #define CONFIG_SYS_TEXT_BASE 0xfc000000
include/configs/cpci5200.h
Diff comments   View file @ b2a6dfe
... ... @@ -23,8 +23,7 @@
23 23 * (easy to change)
24 24 */
25 25  
26   -#define CONFIG_MPC5200 1 /* This is an MPC5xxx CPU */
27   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
  26 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
28 27 #define CONFIG_ICECUBE 1 /* ... on IceCube board */
29 28 #define CONFIG_CPCI5200 1 /* ... on CPCI5200 board */
30 29 #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */
include/configs/digsy_mtc.h
Diff comments   View file @ b2a6dfe
... ... @@ -20,8 +20,7 @@
20 20 * High Level Configuration Options
21 21 */
22 22  
23   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
24   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
  23 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
25 24 #define CONFIG_DIGSY_MTC 1 /* ... on InterControl digsyMTC board */
26 25  
27 26 /*
include/configs/galaxy5200.h
Diff comments   View file @ b2a6dfe
... ... @@ -23,8 +23,7 @@
23 23 * High Level Configuration Options
24 24 * (easy to change)
25 25 */
26   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
27   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
  26 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
28 27 #define CONFIG_SYS_MPC5XXX_CLKIN 33333333 /* ... running at 33.333333MHz */
29 28  
30 29 /*
include/configs/hmi1001.h
Diff comments   View file @ b2a6dfe
... ... @@ -13,9 +13,8 @@
13 13 * (easy to change)
14 14 */
15 15  
16   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
17   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
18   -#define CONFIG_HMI1001 1 /* HMI1001 board */
  16 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
  17 +#define CONFIG_HMI1001 1 /* HMI1001 board */
19 18  
20 19 #ifndef CONFIG_SYS_TEXT_BASE
21 20 #define CONFIG_SYS_TEXT_BASE 0xFFF00000
include/configs/inka4x0.h
Diff comments   View file @ b2a6dfe
... ... @@ -16,9 +16,8 @@
16 16 * (easy to change)
17 17 */
18 18  
19   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
20   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
21   -#define CONFIG_INKA4X0 1 /* INKA4x0 board */
  19 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
  20 +#define CONFIG_INKA4X0 1 /* INKA4x0 board */
22 21  
23 22 /*
24 23 * Valid values for CONFIG_SYS_TEXT_BASE are:
include/configs/ipek01.h
Diff comments   View file @ b2a6dfe
... ... @@ -16,9 +16,8 @@
16 16 */
17 17  
18 18 #define CONFIG_MPC5200
19   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
20   -#define CONFIG_MPX5200 1 /* ... on MPX5200 board */
21   -#define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */
  19 +#define CONFIG_MPX5200 1 /* MPX5200 board */
  20 +#define CONFIG_MPC5200_DDR 1 /* use DDR RAM */
22 21 #define CONFIG_IPEK01 /* Motherboard is ipek01 */
23 22  
24 23 #define CONFIG_SYS_TEXT_BASE 0xfc000000
include/configs/jupiter.h
Diff comments   View file @ b2a6dfe
... ... @@ -13,8 +13,7 @@
13 13 * (easy to change)
14 14 */
15 15  
16   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
17   -#define CONFIG_MPC5200 1 /* especially an MPC5200 */
  16 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
18 17 #define CONFIG_JUPITER 1 /* ... on Jupiter board */
19 18  
20 19 /*
include/configs/manroland/mpc5200-common.h
Diff comments   View file @ b2a6dfe
... ... @@ -12,8 +12,7 @@
12 12 * High Level Configuration Options
13 13 * (easy to change)
14 14 */
15   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
16   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
  15 +#define CONFIG_MPC5200 1 /* MPC5200 CPU */
17 16  
18 17 #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */
19 18  
include/configs/mcc200.h
Diff comments   View file @ b2a6dfe
... ... @@ -14,8 +14,7 @@
14 14 */
15 15  
16 16 #define CONFIG_MPC5200
17   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
18   -#define CONFIG_MCC200 1 /* ... on MCC200 board */
  17 +#define CONFIG_MCC200 1 /* MCC200 board */
19 18  
20 19 /*
21 20 * Valid values for CONFIG_SYS_TEXT_BASE are:
include/configs/mecp5200.h
Diff comments   View file @ b2a6dfe
... ... @@ -23,8 +23,7 @@
23 23 * (easy to change)
24 24 */
25 25  
26   -#define CONFIG_MPC5200 1 /* This is an MPC5xxx CPU */
27   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
  26 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
28 27 #define CONFIG_ICECUBE 1 /* ... on IceCube board */
29 28 #define CONFIG_MECP5200 1 /* ... on MECP5200 board */
30 29 #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */
include/configs/motionpro.h
Diff comments   View file @ b2a6dfe
... ... @@ -15,8 +15,7 @@
15 15 */
16 16  
17 17 /* CPU and board */
18   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
19   -#define CONFIG_MPC5200 1 /* More exactly a MPC5200 */
  18 +#define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */
20 19 #define CONFIG_MOTIONPRO 1 /* ... on Promess Motion-PRO board */
21 20  
22 21 #define CONFIG_HIGH_BATS 1 /* High BATs supported */
include/configs/munices.h
Diff comments   View file @ b2a6dfe
... ... @@ -11,8 +11,7 @@
11 11 * High Level Configuration Options
12 12 * (easy to change)
13 13 */
14   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
15   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
  14 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
16 15 #define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */
17 16 #define CONFIG_MUNICES 1 /* ... on MUNICes board */
18 17  
include/configs/o2dnt-common.h
Diff comments   View file @ b2a6dfe
... ... @@ -16,7 +16,6 @@
16 16 /*
17 17 * High Level Configuration Options
18 18 */
19   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
20 19 #define CONFIG_MPC5200
21 20  
22 21 #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* running at 33.000000MHz */
include/configs/pcm030.h
Diff comments   View file @ b2a6dfe
... ... @@ -20,8 +20,7 @@
20 20 High Level Configuration Options
21 21 (easy to change)
22 22 -----------------------------------------------------------------------------*/
23   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
24   -#define CONFIG_MPC5200 1 /* (more precisely an MPC5200 CPU) */
  23 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
25 24 #define CONFIG_MPC5200_DDR 1 /* (with DDR-SDRAM) */
26 25 #define CONFIG_PHYCORE_MPC5200B_TINY 1 /* phyCORE-MPC5200B -> */
27 26 /* FEC configuration and IDE */
include/configs/pf5200.h
Diff comments   View file @ b2a6dfe
... ... @@ -22,8 +22,7 @@
22 22 * (easy to change)
23 23 */
24 24  
25   -#define CONFIG_MPC5200 1 /* This is an MPC5xxx CPU */
26   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
  25 +#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
27 26 #define CONFIG_ICECUBE 1 /* ... on IceCube board */
28 27 #define CONFIG_PF5200 1 /* ... on PF5200 board */
29 28 #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */
include/configs/v38b.h
Diff comments   View file @ b2a6dfe
... ... @@ -12,7 +12,6 @@
12 12 * High Level Configuration Options
13 13 * (easy to change)
14 14 */
15   -#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
16 15 #define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */
17 16 #define CONFIG_V38B 1 /* ...on V38B board */
18 17