Rename ARCH_RMOBILE_BOARD_STRING to ARCH_RENESAS_BOARD_STRING because all the chips are made by Renesas, while only a subset of them is from the R-Mobile line.
Use the following command to perform the rename:
" $ git grep -l 'ARCH_RMOBILE_BOARD_STRING' | \ xargs -I {} sed -i 's@ARCH_RMOBILE_BOARD_STRING@ARCH_RENESAS_BOARD_STRING@g' {} "
Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org Cc: Paul Barker paul.barker.ct@bp.renesas.com Cc: Tom Rini trini@konsulko.com --- arch/arm/mach-rmobile/Kconfig.32 | 2 +- arch/arm/mach-rmobile/board.c | 4 ++-- configs/alt_defconfig | 2 +- configs/blanche_defconfig | 2 +- configs/gose_defconfig | 2 +- configs/koelsch_defconfig | 2 +- configs/lager_defconfig | 2 +- configs/porter_defconfig | 2 +- configs/silk_defconfig | 2 +- configs/stout_defconfig | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index f7079a26b06..b546e097c34 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -1,6 +1,6 @@ if RCAR_32
-config ARCH_RMOBILE_BOARD_STRING +config ARCH_RENESAS_BOARD_STRING string "Renesas RCar Gen2 board name" default "Board"
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c index 79c7e02671f..f061e41173a 100644 --- a/arch/arm/mach-rmobile/board.c +++ b/arch/arm/mach-rmobile/board.c @@ -7,10 +7,10 @@ #include <init.h> #include <asm/io.h>
-#ifdef CONFIG_ARCH_RMOBILE_BOARD_STRING +#ifdef CONFIG_ARCH_RENESAS_BOARD_STRING int checkboard(void) { - printf("Board: %s\n", CONFIG_ARCH_RMOBILE_BOARD_STRING); + printf("Board: %s\n", CONFIG_ARCH_RENESAS_BOARD_STRING); return 0; } #endif diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 35707a65960..ff2f7d22bbc 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -18,7 +18,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="r8a7794-alt-u-boot" CONFIG_SPL_TEXT_BASE=0xe6300000 -CONFIG_ARCH_RMOBILE_BOARD_STRING="Alt" +CONFIG_ARCH_RENESAS_BOARD_STRING="Alt" CONFIG_R8A7794=y CONFIG_TARGET_ALT=y CONFIG_SYS_MONITOR_LEN=262144 diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index f328af84dfa..d8c0f784176 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -13,7 +13,7 @@ CONFIG_ENV_OFFSET=0x40000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot" -CONFIG_ARCH_RMOBILE_BOARD_STRING="Blanche" +CONFIG_ARCH_RENESAS_BOARD_STRING="Blanche" CONFIG_R8A7792=y CONFIG_TARGET_BLANCHE=y CONFIG_SYS_MONITOR_LEN=262144 diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 92bb5911765..6f2a015d3e9 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -18,7 +18,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="r8a7793-gose-u-boot" CONFIG_SPL_TEXT_BASE=0xe6300000 -CONFIG_ARCH_RMOBILE_BOARD_STRING="Gose" +CONFIG_ARCH_RENESAS_BOARD_STRING="Gose" CONFIG_R8A7793=y CONFIG_TARGET_GOSE=y CONFIG_SYS_MONITOR_LEN=262144 diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 8d9c3b94499..37511f8fe9a 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -18,7 +18,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="r8a7791-koelsch-u-boot" CONFIG_SPL_TEXT_BASE=0xe6300000 -CONFIG_ARCH_RMOBILE_BOARD_STRING="Koelsch" +CONFIG_ARCH_RENESAS_BOARD_STRING="Koelsch" CONFIG_R8A7791=y CONFIG_TARGET_KOELSCH=y CONFIG_SYS_MONITOR_LEN=262144 diff --git a/configs/lager_defconfig b/configs/lager_defconfig index d00314c60e4..30582bfa3b1 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -18,7 +18,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="r8a7790-lager-u-boot" CONFIG_SPL_TEXT_BASE=0xe6300000 -CONFIG_ARCH_RMOBILE_BOARD_STRING="Lager" +CONFIG_ARCH_RENESAS_BOARD_STRING="Lager" CONFIG_R8A7790=y CONFIG_TARGET_LAGER=y CONFIG_SYS_MONITOR_LEN=262144 diff --git a/configs/porter_defconfig b/configs/porter_defconfig index a343c8e83de..2f4f03d27f2 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -18,7 +18,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="r8a7791-porter-u-boot" CONFIG_SPL_TEXT_BASE=0xe6300000 -CONFIG_ARCH_RMOBILE_BOARD_STRING="Porter" +CONFIG_ARCH_RENESAS_BOARD_STRING="Porter" CONFIG_R8A7791=y CONFIG_TARGET_PORTER=y CONFIG_SYS_MONITOR_LEN=262144 diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 5f08ae0fcf9..e0ed90fa7e1 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -18,7 +18,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk-u-boot" CONFIG_SPL_TEXT_BASE=0xe6300000 -CONFIG_ARCH_RMOBILE_BOARD_STRING="Silk" +CONFIG_ARCH_RENESAS_BOARD_STRING="Silk" CONFIG_R8A7794=y CONFIG_TARGET_SILK=y CONFIG_SYS_MONITOR_LEN=262144 diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 0375630adea..9f5c61d0e1d 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -18,7 +18,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="r8a7790-stout-u-boot" CONFIG_SPL_TEXT_BASE=0xe6300000 -CONFIG_ARCH_RMOBILE_BOARD_STRING="Stout" +CONFIG_ARCH_RENESAS_BOARD_STRING="Stout" CONFIG_R8A7790=y CONFIG_TARGET_STOUT=y CONFIG_SYS_MONITOR_LEN=262144