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>

diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
index 49d6206ac2588b516688f3a1b7f4383ef78e3d63..ab05966d15ba60ead03bc9c04ef2fb74b2d18459 100644 (file)
--- 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

diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 157d830ff1646164546adec9552eb12faa67d8a3..886caac035bd196559c953b7cfb9e512c96a17b2 100644 (file)
--- 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

diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index 14d6c843ae09ab5cc8e82444ec8cb39aba173d8e..cade19e6cbac2a7b51dfbc7d4b538d188b8868da 100644 (file)
--- 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

diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index 500ebc6983c9aa54f4c6b025d48fcdd0987a8496..37822cdeae22b78be04191d66db5e5a7d4923db9 100644 (file)
--- 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

diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index 5f10d9a304ad15229aeaa7d5af1985c2e5b21b4e..88ef8947885106a51cfe07a2f59c52378c994892 100644 (file)
--- 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

diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index acc72891395939b73cc4f635967866a0c8f9f84c..dad4ceb5c293711b329abecaf08758cc3ed22d47 100644 (file)
--- 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

diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index c0778ee824d8c22f16c727f280eb1c02c303974c..f1b11cc7b3501dc94686020e73a64527a28cb239 100644 (file)
--- 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

diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index 7374a30ed2ea662610575ae04724807dc2dbf6bd..65ff3c0a47fe0a3d43a2bb2950deb6ed93200053 100644 (file)
--- 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

diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index ffe1d8b78447fd5c7d3579d7589e00b2314676e1..14f427cd3ae8870a9a8df4886e8aedc583919ce8 100644 (file)
--- 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

diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index 6750dcdd799a34a83a6e7f65e8817eb25bde315c..9f57c2624e7ec9c0c66aedd28b59e5e6c98eb72e 100644 (file)
--- 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

diff --git a/include/configs/alt.h b/include/configs/alt.h
index e35ddc8ed878f02515bf7a1a62bd23a15b44fae6..84fc705a04cb4390b3eb02463c65baf67053830a 100644 (file)
--- 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"

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 94aecb7de1c458eea577878055706c504dc5a180..cade5bb3a058f838b44756c31f959c2d1891f004 100644 (file)
--- 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
 

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index ce7c7164659cb597b5e59d3f472ce7557e7643e3..4948bbb063d9c669c190e949ea98a317e7a8a0c7 100755 (executable)
--- 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"

diff --git a/include/configs/gose.h b/include/configs/gose.h
index fab0edd5e607dc07479bc684243535705a4222c4..dcd213008058fcee417f6fc8bd74b1d952b43fa1 100644 (file)
--- 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"

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index c449e43f9572c4b56654c854987fd371e8fe5e48..f1571a457662f3bea0ae04d29422fd0f009b1d72 100644 (file)
--- 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"

diff --git a/include/configs/lager.h b/include/configs/lager.h
index 000e5cd8f3fcb1de4f349a1515871abdf451a651..53b717f2601a3c659cedc2354509a032c3941e88 100644 (file)
--- 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"

diff --git a/include/configs/porter.h b/include/configs/porter.h
index 10dce6b4769bc54c2fb6d2dd34681b64c66d1680..f7cf7181df70858c32505f3e56e46534e70ee42e 100644 (file)
--- 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"

diff --git a/include/configs/silk.h b/include/configs/silk.h
index 79a4f06c0b4775d93d6f31af2233ffe17779452e..0ece76f799e3708379ef3b34addcaa0af779d680 100644 (file)
--- 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"

diff --git a/include/configs/stout.h b/include/configs/stout.h
index 789f364168d928d49d1a544750f5a54603a52abd..0a02216cd53e52d2cd962930b7e0f05ecfe8487e 100644 (file)
--- 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"

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6be4a76df30bafc5f916639b0db88d6ff85f0602..fa310c15da00c29ec2fee266ad17d6207a6414f3 100644 (file)
--- 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