ARM: rmobile: Convert CONFIG_R8A77xx to Kconfig

Convert these configuration options to Kconfig, update board defconfigs and drop them from whitelist. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
7 years ago · b606e1bbc3
parent 34df58a95e
commit b606e1bbc3
20 changed files with 35 additions and 15 deletions
--- a/arch/arm/mach-rmobile/Kconfig.32
+++ b/arch/arm/mach-rmobile/Kconfig.32
@ -1,5 +1,31 @@
 if RCAR_32

+config RCAR_GEN2
+	bool "Renesas RCar Gen2"
+
+config R8A7740
+	bool "Renesas SoC R8A7740"
+
+config R8A7790
+	bool "Renesas SoC R8A7790"
+	select RCAR_GEN2
+
+config R8A7791
+	bool "Renesas SoC R8A7791"
+	select RCAR_GEN2
+
+config R8A7792
+	bool "Renesas SoC R8A7792"
+	select RCAR_GEN2
+
+config R8A7793
+	bool "Renesas SoC R8A7793"
+	select RCAR_GEN2
+
+config R8A7794
+	bool "Renesas SoC R8A7794"
+	select RCAR_GEN2
+
 choice
 	prompt "Renesas ARM SoCs board select"
 	optional
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_R8A7794=y
 CONFIG_TARGET_ALT=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@ -1,6 +1,7 @@
 CONFIG_ARM=y
 # CONFIG_SYS_THUMB_BUILD is not set
 CONFIG_ARCH_RMOBILE=y
+CONFIG_R8A7740=y
 CONFIG_TARGET_ARMADILLO_800EVA=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_R8A7792=y
 CONFIG_TARGET_BLANCHE=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_BOOTZ=y
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_R8A7793=y
 CONFIG_TARGET_GOSE=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_R8A7791=y
 CONFIG_TARGET_KOELSCH=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_R8A7790=y
 CONFIG_TARGET_LAGER=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_R8A7791=y
 CONFIG_TARGET_PORTER=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_R8A7794=y
 CONFIG_TARGET_SILK=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_R8A7790=y
 CONFIG_TARGET_STOUT=y
 CONFIG_BOOTDELAY=3
 CONFIG_VERSION_VARIABLE=y
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@ -11,7 +11,6 @@
 #define __ALT_H

 #undef DEBUG
-#define CONFIG_R8A7794
 #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_R8A7740
 #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
 #define CONFIG_SH_GPIO_PFC

--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@ -11,7 +11,6 @@
 #define __BLANCHE_H

 #undef DEBUG
-#define CONFIG_R8A7792
 #define CONFIG_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_R8A7793
 #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_R8A7791
 #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch"

 #include "rcar-gen2-common.h"
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@ -11,7 +11,6 @@
 #define __LAGER_H

 #undef DEBUG
-#define CONFIG_R8A7790
 #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_R8A7791
 #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_R8A7794
 #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_R8A7790
 #define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout"

 #include "rcar-gen2-common.h"
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -1725,12 +1725,6 @@ CONFIG_R8A66597_BASE_ADDR
 CONFIG_R8A66597_ENDIAN
 CONFIG_R8A66597_LDRV
 CONFIG_R8A66597_XTAL
-CONFIG_R8A7740
-CONFIG_R8A7790
-CONFIG_R8A7791
-CONFIG_R8A7792
-CONFIG_R8A7793
-CONFIG_R8A7794
 CONFIG_RAMBOOT
 CONFIG_RAMBOOTCOMMAND
 CONFIG_RAMBOOTCOMMAND_TFTP