[U-Boot] [PATCH 2/3] ARM: rmobile: Convert CONFIG_ARCH_RMOBILE_BOARD_STRING to Kconfig

Marek Vasut marek.vasut at gmail.com
Wed May 2 09:57:40 UTC 2018 

Convert the symbol to Kconfig, no functional change.

Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu at 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
-- 
2.16.2

More information about the U-Boot mailing list