[U-Boot] [PATCH 1/3] ARM: rmobile: Fix CONFIG_RMOBILE_BOARD_STRING
Rename CONFIG_RMOBILE_BOARD_STRING to CONFIG_ARCH_RMOBILE_BOARD_STRING to make things consistent, no functional change.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- board/renesas/blanche/blanche.c | 2 +- include/configs/blanche.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index 5dc307370d..3ce633c8a2 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -469,7 +469,7 @@ int dram_init(void) }
const struct rmobile_sysinfo sysinfo = { - CONFIG_RMOBILE_BOARD_STRING + CONFIG_ARCH_RMOBILE_BOARD_STRING };
void reset_cpu(ulong addr) diff --git a/include/configs/blanche.h b/include/configs/blanche.h index ae3213f959..c8af6e9fa2 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -11,7 +11,7 @@ #define __BLANCHE_H
#undef DEBUG -#define CONFIG_RMOBILE_BOARD_STRING "Blanche" +#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Blanche"
#include "rcar-gen2-common.h"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bbc44e3291..cf95a29533 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1674,7 +1674,6 @@ CONFIG_REVISION_TAG CONFIG_RFSPART CONFIG_RIO CONFIG_RMII -CONFIG_RMOBILE_BOARD_STRING CONFIG_RMSTP0_ENA CONFIG_RMSTP10_ENA CONFIG_RMSTP11_ENA
Convert the symbol to Kconfig, no functional change.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- arch/arm/mach-rmobile/Kconfig.32 | 4 ++++ configs/alt_defconfig | 1 + configs/armadillo-800eva_defconfig | 1 + configs/blanche_defconfig | 1 + configs/gose_defconfig | 1 + configs/koelsch_defconfig | 1 + configs/kzm9g_defconfig | 1 + configs/lager_defconfig | 1 + configs/porter_defconfig | 1 + configs/silk_defconfig | 1 + configs/stout_defconfig | 1 + 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/silk.h | 1 - include/configs/stout.h | 1 - scripts/config_whitelist.txt | 1 - 22 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index 84c1a6d07b..1ceb329f1f 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -1,5 +1,9 @@ if RCAR_32
+config ARCH_RMOBILE_BOARD_STRING + string "Renesas RCar Gen2 board name" + default "Board" + config RCAR_GEN2 bool "Renesas RCar Gen2"
diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 82499615c7..b0b864c1a1 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Alt" CONFIG_R8A7794=y CONFIG_TARGET_ALT=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index 2c212e297b..753077b676 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_RMOBILE=y CONFIG_SYS_TEXT_BASE=0xE80C0000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Armadillo-800EVA Board" CONFIG_R8A7740=y CONFIG_TARGET_ARMADILLO_800EVA=y CONFIG_BOOTDELAY=3 diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index d9c08e1a4b..bd5fccac93 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Blanche" CONFIG_R8A7792=y CONFIG_TARGET_BLANCHE=y CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot" diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 3c6a4bd41b..8479887604 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Gose" CONFIG_R8A7793=y CONFIG_TARGET_GOSE=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index f182666356..faca596115 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Koelsch" CONFIG_R8A7791=y CONFIG_TARGET_KOELSCH=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig index f34fe9be18..af931855b7 100644 --- a/configs/kzm9g_defconfig +++ b/configs/kzm9g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_RMOBILE=y CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="KMC KZM-A9-GT" CONFIG_TARGET_KZM9G=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 1071da24d2..901b34e1dd 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Lager" CONFIG_R8A7790=y CONFIG_TARGET_LAGER=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 64b064d1a8..b04627efa3 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Porter" CONFIG_R8A7791=y CONFIG_TARGET_PORTER=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 4cb1179a68..c163e823b5 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Silk" CONFIG_R8A7794=y CONFIG_TARGET_SILK=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 4f5ebfa091..d940932baf 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Stout" CONFIG_R8A7790=y CONFIG_TARGET_STOUT=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/include/configs/alt.h b/include/configs/alt.h index 46d7ba9a18..51799bf423 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -11,7 +11,6 @@ #define __ALT_H
#undef DEBUG -#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 6e7ac0a905..826211a527 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -10,7 +10,6 @@ #define __ARMADILLO_800EVA_H
#undef DEBUG -#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 c8af6e9fa2..e4e61ec2a3 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -11,7 +11,6 @@ #define __BLANCHE_H
#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Blanche"
#include "rcar-gen2-common.h"
diff --git a/include/configs/gose.h b/include/configs/gose.h index 1f814bfe7a..5b3dce87e2 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -10,7 +10,6 @@ #define __GOSE_H
#undef DEBUG -#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 ec2162cb80..2571aec550 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -10,7 +10,6 @@ #define __KOELSCH_H
#undef DEBUG -#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 179c7603f2..4781da71af 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -11,7 +11,6 @@ #undef DEBUG
#define CONFIG_SH73A0 -#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 0d9272cfa3..4d45d50ac4 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -11,7 +11,6 @@ #define __LAGER_H
#undef DEBUG -#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 ba444762f1..b4aeb54ef0 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -12,7 +12,6 @@ #define __PORTER_H
#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter"
#include "rcar-gen2-common.h"
diff --git a/include/configs/silk.h b/include/configs/silk.h index 465291fffd..afc7faf66c 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -12,7 +12,6 @@ #define __SILK_H
#undef DEBUG -#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 22e23eb182..1a1a3eb883 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -13,7 +13,6 @@ #define __STOUT_H
#undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout"
#include "rcar-gen2-common.h"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cf95a29533..bdbfcbeb70 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -43,7 +43,6 @@ CONFIG_ARCH_KIRKWOOD CONFIG_ARCH_MAP_SYSMEM CONFIG_ARCH_OMAP4 CONFIG_ARCH_ORION5X -CONFIG_ARCH_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_EXTRAM_BOOT CONFIG_ARCH_TEGRA CONFIG_ARCH_USE_BUILTIN_BSWAP
Pull the symbol from the boards and zap struct rmobile_sysinfo as they are rather useless. The entire purpose of that whole machinery was to print board name in the CONFIG_ARCH_RMOBILE_BOARD_STRING. Do that in a far simpler and more contained manner.
Signed-off-by: Marek Vasut marek.vasut+renesas@gmail.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- arch/arm/mach-rmobile/board.c | 5 ++--- arch/arm/mach-rmobile/include/mach/sys_proto.h | 5 ----- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 4 ---- board/kmc/kzm9g/kzm9g.c | 4 ---- board/renesas/alt/alt.c | 4 ---- board/renesas/blanche/blanche.c | 4 ---- board/renesas/gose/gose.c | 4 ---- board/renesas/koelsch/koelsch.c | 4 ---- board/renesas/lager/lager.c | 4 ---- board/renesas/porter/porter.c | 4 ---- board/renesas/silk/silk.c | 4 ---- board/renesas/stout/stout.c | 4 ---- 12 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c index bdb353062f..b07dbfabc4 100644 --- a/arch/arm/mach-rmobile/board.c +++ b/arch/arm/mach-rmobile/board.c @@ -6,12 +6,11 @@ */ #include <common.h> #include <asm/io.h> -#include <asm/arch/sys_proto.h>
-#ifndef CONFIG_RCAR_GEN3 +#ifdef CONFIG_ARCH_RMOBILE_BOARD_STRING int checkboard(void) { - printf("Board: %s\n", sysinfo.board_string); + printf("Board: %s\n", CONFIG_ARCH_RMOBILE_BOARD_STRING); return 0; } #endif diff --git a/arch/arm/mach-rmobile/include/mach/sys_proto.h b/arch/arm/mach-rmobile/include/mach/sys_proto.h index 326f6b1481..448a0f6d52 100644 --- a/arch/arm/mach-rmobile/include/mach/sys_proto.h +++ b/arch/arm/mach-rmobile/include/mach/sys_proto.h @@ -8,9 +8,4 @@ #ifndef _SYS_PROTO_H_ #define _SYS_PROTO_H_
-struct rmobile_sysinfo { - char *board_string; -}; -extern const struct rmobile_sysinfo sysinfo; - #endif diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index abe69abcc8..d95ba7b8bf 100644 --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c @@ -314,10 +314,6 @@ int dram_init(void) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - int board_late_init(void) { return 0; diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c index a284721cfd..4a791a3c57 100644 --- a/board/kmc/kzm9g/kzm9g.c +++ b/board/kmc/kzm9g/kzm9g.c @@ -348,10 +348,6 @@ int board_init(void) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - int dram_init(void) { gd->ram_size = CONFIG_SYS_SDRAM_SIZE; diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index 7598b1a4b9..4b783b0616 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -106,10 +106,6 @@ int board_phy_config(struct phy_device *phydev) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - void reset_cpu(ulong addr) { struct udevice *dev; diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index 3ce633c8a2..5edcdac13e 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -468,10 +468,6 @@ int dram_init(void) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - void reset_cpu(ulong addr) { } diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index c9209701dd..e8d39a293a 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -111,10 +111,6 @@ int board_phy_config(struct phy_device *phydev) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - void reset_cpu(ulong addr) { struct udevice *dev; diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index 4a4007b7a3..cd07f50e5b 100644 --- a/board/renesas/koelsch/koelsch.c +++ b/board/renesas/koelsch/koelsch.c @@ -113,10 +113,6 @@ int board_phy_config(struct phy_device *phydev) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - void reset_cpu(ulong addr) { struct udevice *dev; diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 505efb5bc4..586c6c3842 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -122,10 +122,6 @@ int board_phy_config(struct phy_device *phydev) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - void reset_cpu(ulong addr) { struct udevice *dev; diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index eb66bc903e..fcf4ff90f0 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -111,10 +111,6 @@ int board_phy_config(struct phy_device *phydev) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - void reset_cpu(ulong addr) { struct udevice *dev; diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index c932c255a0..a50a4ed3a1 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -106,10 +106,6 @@ int board_phy_config(struct phy_device *phydev) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - void reset_cpu(ulong addr) { struct udevice *dev; diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index 192ee66a38..c40daf5623 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -125,10 +125,6 @@ int board_phy_config(struct phy_device *phydev) return 0; }
-const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING -}; - enum env_location env_get_location(enum env_operation op, int prio) { const u32 load_magic = 0xb33fc0de;
On Wed, 2 May 2018 11:57:41 +0200 Marek Vasut marek.vasut@gmail.com wrote:
Pull the symbol from the boards and zap struct rmobile_sysinfo as they are rather useless. The entire purpose of that whole machinery was to print board name in the CONFIG_ARCH_RMOBILE_BOARD_STRING. Do that in a far simpler and more contained manner.
Note that if your SoC/board supports DT, common/board_info.c comes with a common implementation for printing out the "model" property from DT, allowing further zapping of such code.
participants (2)
-
Marek Vasut -
Tuomas Tynkkynen