Message ID | 20171130230657.14496-1-iwamatsu@nigauri.org |
---|---|
State | Rejected |
Delegated to: | Nobuhiro Iwamatsu |
Headers | show |
Series | [U-Boot,1/3] ARM: rmobile: Use CONFIG_SYS_BOARD instaed of CONFIG_ARCH_RMOBILE_BOARD_STRING | expand |
Hi, 2017-12-01 8:06 GMT+09:00 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>: > CONFIG_SYS_BOARD is provided by Kconfig, this has the same value as > CONFIG_ARCH_RMOBILE_BOARD_STRING provided in <BOARD_NAME>.h. > This switches from CONFIG_ARCH_RMOBILE_BOARD_STRING to CONFIG_SYS_BOARD. Sorry, forgot the rebase. Ignore these patches for rmobile. Best regards, Nobuhiro > > Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> > --- > board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +- > board/kmc/kzm9g/kzm9g.c | 2 +- > board/renesas/alt/alt.c | 2 +- > board/renesas/blanche/blanche.c | 2 +- > board/renesas/gose/gose.c | 2 +- > board/renesas/koelsch/koelsch.c | 2 +- > board/renesas/lager/lager.c | 2 +- > board/renesas/porter/porter.c | 2 +- > board/renesas/salvator-x/salvator-x.c | 2 +- > board/renesas/silk/silk.c | 2 +- > board/renesas/stout/stout.c | 2 +- > board/renesas/ulcb/ulcb.c | 2 +- > include/configs/alt.h | 1 - > include/configs/armadillo-800eva.h | 1 - > include/configs/blanche.h | 1 - > include/configs/gose.h | 1 - > include/configs/koelsch.h | 1 - > include/configs/kzm9g.h | 1 - > include/configs/lager.h | 1 - > include/configs/porter.h | 1 - > include/configs/salvator-x.h | 2 -- > include/configs/silk.h | 1 - > include/configs/stout.h | 1 - > include/configs/ulcb.h | 2 -- > scripts/config_whitelist.txt | 1 - > 25 files changed, 12 insertions(+), 27 deletions(-) > > diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c > index abe69abcc8..dcb5c78f55 100644 > --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c > +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c > @@ -315,7 +315,7 @@ int dram_init(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_ARCH_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > int board_late_init(void) > diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c > index a284721cfd..679dff7084 100644 > --- a/board/kmc/kzm9g/kzm9g.c > +++ b/board/kmc/kzm9g/kzm9g.c > @@ -349,7 +349,7 @@ int board_init(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_ARCH_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > int dram_init(void) > diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c > index 0bf8160f1f..a4e3cccf78 100644 > --- a/board/renesas/alt/alt.c > +++ b/board/renesas/alt/alt.c > @@ -217,7 +217,7 @@ int dram_init(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_ARCH_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > void reset_cpu(ulong addr) > diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c > index 574dcda01b..434544d90f 100644 > --- a/board/renesas/blanche/blanche.c > +++ b/board/renesas/blanche/blanche.c > @@ -468,7 +468,7 @@ int dram_init(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > void reset_cpu(ulong addr) > diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c > index 54e126985b..465be87c01 100644 > --- a/board/renesas/gose/gose.c > +++ b/board/renesas/gose/gose.c > @@ -201,7 +201,7 @@ int dram_init(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_ARCH_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > void reset_cpu(ulong addr) > diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c > index 8fa648e40a..45a422044b 100644 > --- a/board/renesas/koelsch/koelsch.c > +++ b/board/renesas/koelsch/koelsch.c > @@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_ARCH_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > void reset_cpu(ulong addr) > diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c > index 562be04760..04343a9be6 100644 > --- a/board/renesas/lager/lager.c > +++ b/board/renesas/lager/lager.c > @@ -235,7 +235,7 @@ int dram_init(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_ARCH_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > void reset_cpu(ulong addr) > diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c > index 5b1a167906..711baf04c5 100644 > --- a/board/renesas/porter/porter.c > +++ b/board/renesas/porter/porter.c > @@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_ARCH_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD, > }; > > void reset_cpu(ulong addr) > diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c > index debd1db721..34cc9018dd 100644 > --- a/board/renesas/salvator-x/salvator-x.c > +++ b/board/renesas/salvator-x/salvator-x.c > @@ -141,7 +141,7 @@ int dram_init_banksize(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_RCAR_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > #define RST_BASE 0xE6160000 > diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c > index a8de402d20..30be941a44 100644 > --- a/board/renesas/silk/silk.c > +++ b/board/renesas/silk/silk.c > @@ -192,7 +192,7 @@ int dram_init(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_ARCH_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > void reset_cpu(ulong addr) > diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c > index d681148273..39fefe7fc9 100644 > --- a/board/renesas/stout/stout.c > +++ b/board/renesas/stout/stout.c > @@ -217,7 +217,7 @@ int dram_init(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_ARCH_RMOBILE_BOARD_STRING > + CONFIG_SYS_BOARD > }; > > static const struct sh_serial_platdata serial_platdata = { > diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c > index ca1b71975b..f78241a268 100644 > --- a/board/renesas/ulcb/ulcb.c > +++ b/board/renesas/ulcb/ulcb.c > @@ -131,5 +131,5 @@ int dram_init_banksize(void) > } > > const struct rmobile_sysinfo sysinfo = { > - CONFIG_RCAR_BOARD_STRING > + CONFIG_SYS_BOARD > }; > diff --git a/include/configs/alt.h b/include/configs/alt.h > index 35518da625..4021910bb3 100644 > --- a/include/configs/alt.h > +++ b/include/configs/alt.h > @@ -12,7 +12,6 @@ > > #undef DEBUG > #define CONFIG_R8A7794 > -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt" > > #include "rcar-gen2-common.h" > > diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h > index 66ae76b2d2..135619ef31 100644 > --- a/include/configs/armadillo-800eva.h > +++ b/include/configs/armadillo-800eva.h > @@ -11,7 +11,6 @@ > > #undef DEBUG > #define CONFIG_R8A7740 > -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n" > #define CONFIG_SH_GPIO_PFC > > #include <asm/arch/rmobile.h> > diff --git a/include/configs/blanche.h b/include/configs/blanche.h > index ce7c716465..7f9cc71af3 100755 > --- a/include/configs/blanche.h > +++ b/include/configs/blanche.h > @@ -12,7 +12,6 @@ > > #undef DEBUG > #define CONFIG_R8A7792 > -#define CONFIG_RMOBILE_BOARD_STRING "Blanche" > > #include "rcar-gen2-common.h" > > diff --git a/include/configs/gose.h b/include/configs/gose.h > index 610ba1a7ac..c94f7bf252 100644 > --- a/include/configs/gose.h > +++ b/include/configs/gose.h > @@ -11,7 +11,6 @@ > > #undef DEBUG > #define CONFIG_R8A7793 > -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose" > > #include "rcar-gen2-common.h" > > diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h > index b9214d2f34..a0cab809b1 100644 > --- a/include/configs/koelsch.h > +++ b/include/configs/koelsch.h > @@ -11,7 +11,6 @@ > > #undef DEBUG > #define CONFIG_R8A7791 > -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch" > > #include "rcar-gen2-common.h" > > diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h > index 16f37a016d..4eb90db7f2 100644 > --- a/include/configs/kzm9g.h > +++ b/include/configs/kzm9g.h > @@ -12,7 +12,6 @@ > > #define CONFIG_SH73A0 > #define CONFIG_KZM_A9_GT > -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "KMC KZM-A9-GT" > #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G > > #include <asm/arch/rmobile.h> > diff --git a/include/configs/lager.h b/include/configs/lager.h > index 291b03c50b..162828b787 100644 > --- a/include/configs/lager.h > +++ b/include/configs/lager.h > @@ -12,7 +12,6 @@ > > #undef DEBUG > #define CONFIG_R8A7790 > -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager" > > #include "rcar-gen2-common.h" > > diff --git a/include/configs/porter.h b/include/configs/porter.h > index 451d9dd66f..a479566146 100644 > --- a/include/configs/porter.h > +++ b/include/configs/porter.h > @@ -13,7 +13,6 @@ > > #undef DEBUG > #define CONFIG_R8A7791 > -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter" > > #include "rcar-gen2-common.h" > > diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h > index 77a12de963..0b154c13f5 100644 > --- a/include/configs/salvator-x.h > +++ b/include/configs/salvator-x.h > @@ -12,8 +12,6 @@ > > #undef DEBUG > > -#define CONFIG_RCAR_BOARD_STRING "Salvator-X" > - > #include "rcar-gen3-common.h" > > /* SCIF */ > diff --git a/include/configs/silk.h b/include/configs/silk.h > index 0384325cb5..60a51dc282 100644 > --- a/include/configs/silk.h > +++ b/include/configs/silk.h > @@ -13,7 +13,6 @@ > > #undef DEBUG > #define CONFIG_R8A7794 > -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk" > > #include "rcar-gen2-common.h" > > diff --git a/include/configs/stout.h b/include/configs/stout.h > index 9422c042f3..b5de336aa1 100644 > --- a/include/configs/stout.h > +++ b/include/configs/stout.h > @@ -14,7 +14,6 @@ > > #undef DEBUG > #define CONFIG_R8A7790 > -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout" > > #include "rcar-gen2-common.h" > > diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h > index b54e63c2a2..30c284bd0c 100644 > --- a/include/configs/ulcb.h > +++ b/include/configs/ulcb.h > @@ -12,8 +12,6 @@ > > #undef DEBUG > > -#define CONFIG_RCAR_BOARD_STRING "ULCB" > - > #include "rcar-gen3-common.h" > > /* M3 ULCB has 2 banks, each with 1 GiB of RAM */ > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 402f5c04f7..52e7691c5d 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -57,7 +57,6 @@ CONFIG_ARCH_ORION5X > CONFIG_ARCH_PLEB > CONFIG_ARCH_PXA_CERF > CONFIG_ARCH_PXA_IDP > -CONFIG_ARCH_RMOBILE_BOARD_STRING > CONFIG_ARCH_RMOBILE_EXTRAM_BOOT > CONFIG_ARCH_TEGRA > CONFIG_ARCH_USE_BUILTIN_BSWAP > -- > 2.15.0 >
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index abe69abcc8..dcb5c78f55 100644 --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c @@ -315,7 +315,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; int board_late_init(void) diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c index a284721cfd..679dff7084 100644 --- a/board/kmc/kzm9g/kzm9g.c +++ b/board/kmc/kzm9g/kzm9g.c @@ -349,7 +349,7 @@ int board_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; int dram_init(void) diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index 0bf8160f1f..a4e3cccf78 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -217,7 +217,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index 574dcda01b..434544d90f 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -468,7 +468,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index 54e126985b..465be87c01 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -201,7 +201,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index 8fa648e40a..45a422044b 100644 --- a/board/renesas/koelsch/koelsch.c +++ b/board/renesas/koelsch/koelsch.c @@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 562be04760..04343a9be6 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -235,7 +235,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index 5b1a167906..711baf04c5 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD, }; void reset_cpu(ulong addr) diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index debd1db721..34cc9018dd 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -141,7 +141,7 @@ int dram_init_banksize(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_RCAR_BOARD_STRING + CONFIG_SYS_BOARD }; #define RST_BASE 0xE6160000 diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index a8de402d20..30be941a44 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -192,7 +192,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index d681148273..39fefe7fc9 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -217,7 +217,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; static const struct sh_serial_platdata serial_platdata = { diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index ca1b71975b..f78241a268 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -131,5 +131,5 @@ int dram_init_banksize(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_RCAR_BOARD_STRING + CONFIG_SYS_BOARD }; diff --git a/include/configs/alt.h b/include/configs/alt.h index 35518da625..4021910bb3 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -12,7 +12,6 @@ #undef DEBUG #define CONFIG_R8A7794 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt" #include "rcar-gen2-common.h" diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 66ae76b2d2..135619ef31 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_R8A7740 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n" #define CONFIG_SH_GPIO_PFC #include <asm/arch/rmobile.h> diff --git a/include/configs/blanche.h b/include/configs/blanche.h index ce7c716465..7f9cc71af3 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -12,7 +12,6 @@ #undef DEBUG #define CONFIG_R8A7792 -#define CONFIG_RMOBILE_BOARD_STRING "Blanche" #include "rcar-gen2-common.h" diff --git a/include/configs/gose.h b/include/configs/gose.h index 610ba1a7ac..c94f7bf252 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_R8A7793 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose" #include "rcar-gen2-common.h" diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index b9214d2f34..a0cab809b1 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_R8A7791 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch" #include "rcar-gen2-common.h" diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 16f37a016d..4eb90db7f2 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -12,7 +12,6 @@ #define CONFIG_SH73A0 #define CONFIG_KZM_A9_GT -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "KMC KZM-A9-GT" #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G #include <asm/arch/rmobile.h> diff --git a/include/configs/lager.h b/include/configs/lager.h index 291b03c50b..162828b787 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -12,7 +12,6 @@ #undef DEBUG #define CONFIG_R8A7790 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager" #include "rcar-gen2-common.h" diff --git a/include/configs/porter.h b/include/configs/porter.h index 451d9dd66f..a479566146 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -13,7 +13,6 @@ #undef DEBUG #define CONFIG_R8A7791 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter" #include "rcar-gen2-common.h" diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 77a12de963..0b154c13f5 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -12,8 +12,6 @@ #undef DEBUG -#define CONFIG_RCAR_BOARD_STRING "Salvator-X" - #include "rcar-gen3-common.h" /* SCIF */ diff --git a/include/configs/silk.h b/include/configs/silk.h index 0384325cb5..60a51dc282 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -13,7 +13,6 @@ #undef DEBUG #define CONFIG_R8A7794 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk" #include "rcar-gen2-common.h" diff --git a/include/configs/stout.h b/include/configs/stout.h index 9422c042f3..b5de336aa1 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -14,7 +14,6 @@ #undef DEBUG #define CONFIG_R8A7790 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout" #include "rcar-gen2-common.h" diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index b54e63c2a2..30c284bd0c 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -12,8 +12,6 @@ #undef DEBUG -#define CONFIG_RCAR_BOARD_STRING "ULCB" - #include "rcar-gen3-common.h" /* M3 ULCB has 2 banks, each with 1 GiB of RAM */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 402f5c04f7..52e7691c5d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -57,7 +57,6 @@ CONFIG_ARCH_ORION5X CONFIG_ARCH_PLEB CONFIG_ARCH_PXA_CERF CONFIG_ARCH_PXA_IDP -CONFIG_ARCH_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_EXTRAM_BOOT CONFIG_ARCH_TEGRA CONFIG_ARCH_USE_BUILTIN_BSWAP
CONFIG_SYS_BOARD is provided by Kconfig, this has the same value as CONFIG_ARCH_RMOBILE_BOARD_STRING provided in <BOARD_NAME>.h. This switches from CONFIG_ARCH_RMOBILE_BOARD_STRING to CONFIG_SYS_BOARD. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> --- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +- board/kmc/kzm9g/kzm9g.c | 2 +- board/renesas/alt/alt.c | 2 +- board/renesas/blanche/blanche.c | 2 +- board/renesas/gose/gose.c | 2 +- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/lager/lager.c | 2 +- board/renesas/porter/porter.c | 2 +- board/renesas/salvator-x/salvator-x.c | 2 +- board/renesas/silk/silk.c | 2 +- board/renesas/stout/stout.c | 2 +- board/renesas/ulcb/ulcb.c | 2 +- include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/salvator-x.h | 2 -- include/configs/silk.h | 1 - include/configs/stout.h | 1 - include/configs/ulcb.h | 2 -- scripts/config_whitelist.txt | 1 - 25 files changed, 12 insertions(+), 27 deletions(-)