ARM: rmobile: Convert CONFIG_ARCH_RMOBILE_BOARD_STRING to Kconfig

Convert the symbol to Kconfig, no functional change. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
6 years ago · 83a64bebe4
parent 3ce88cd7e1
commit 83a64bebe4
22 changed files with 14 additions and 11 deletions
--- 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"

--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"

--- 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>
--- 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"

--- 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"

--- 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"

--- 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>
--- 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"

--- 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"

--- 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"

--- 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"

--- 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