[U-Boot] [PATCH 3/3] ARM: rmobile: Move config of SoCs to Kconfig

[Nobuhiro Iwamatsu]

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 arch/arm/mach-rmobile/Kconfig.32   | 31 +++++++++++++++++++++++++++++++
 include/configs/alt.h              |  1 -
 include/configs/armadillo-800eva.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       |  7 -------
 11 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
index 89588aaf72..59844ab071 100644
--- a/arch/arm/mach-rmobile/Kconfig.32
+++ b/arch/arm/mach-rmobile/Kconfig.32
@@ -1,52 +1,83 @@
 if RCAR_32
 
+config R8A7740
+	bool
+
+config R8A7790
+	bool
+
+config R8A7791
+	bool
+
+config R8A7792
+	bool
+
+config R8A7793
+	bool
+
+config R8A7794
+	bool
+
+config SH73A0
+	bool
+
 choice
 	prompt "Renesus ARM SoCs board select"
 	optional
 
 config TARGET_ARMADILLO_800EVA
 	bool "armadillo 800 eva board"
+	select R8A7740
 
 config TARGET_BLANCHE
 	bool "Blanche board"
+	select R8A7792
 	select DM
 	select DM_SERIAL
 
 config TARGET_GOSE
 	bool "Gose board"
+	select R8A7793
 	select DM
 	select DM_SERIAL
 
 config TARGET_KOELSCH
 	bool "Koelsch board"
+	select R8A7791
 	select DM
 	select DM_SERIAL
 
 config TARGET_LAGER
 	bool "Lager board"
+	select R8A7790
 	select DM
 	select DM_SERIAL
 
 config TARGET_KZM9G
 	bool "KZM9D board"
+	select SH73A0
 
 config TARGET_ALT
 	bool "Alt board"
+	select R8A7794
 	select DM
 	select DM_SERIAL
 
 config TARGET_SILK
 	bool "Silk board"
+	select R8A7794
 	select DM
 	select DM_SERIAL
 
 config TARGET_PORTER
 	bool "Porter board"
+	select R8A7791
 	select DM
 	select DM_SERIAL
 
 config TARGET_STOUT
 	bool "Stout board"
+	select R8A7790
 	select DM
 	select DM_SERIAL
 
diff --git a/include/configs/alt.h b/include/configs/alt.h
index d1bb984984..788368b959 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -11,7 +11,6 @@
 #define __ALT_H
 
 #undef DEBUG
-#define CONFIG_R8A7794
 
 #include "rcar-gen2-common.h"
 
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index ca058bf1a1..4686f879bf 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_R8A7740
 #define CONFIG_SH_GPIO_PFC
 
 #include <asm/arch/rmobile.h>
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 2f171d358b..4abd9777f9 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -10,7 +10,6 @@
 #define __GOSE_H
 
 #undef DEBUG
-#define CONFIG_R8A7793
 
 #include "rcar-gen2-common.h"
 
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 89680b7c8d..d8a670c48d 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -10,7 +10,6 @@
 #define __KOELSCH_H
 
 #undef DEBUG
-#define CONFIG_R8A7791
 
 #include "rcar-gen2-common.h"
 
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 25e2f79c92..aecea73a00 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -10,7 +10,6 @@
 
 #undef DEBUG
 
-#define CONFIG_SH73A0
 #define CONFIG_KZM_A9_GT
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
 
diff --git a/include/configs/lager.h b/include/configs/lager.h
index f7ea95fce6..cb4c38027c 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -11,7 +11,6 @@
 #define __LAGER_H
 
 #undef DEBUG
-#define CONFIG_R8A7790
 
 #include "rcar-gen2-common.h"
 
diff --git a/include/configs/porter.h b/include/configs/porter.h
index a966cf3c76..52b27c7537 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -12,7 +12,6 @@
 #define __PORTER_H
 
 #undef DEBUG
-#define CONFIG_R8A7791
 
 #include "rcar-gen2-common.h"
 
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 18c53e6b8c..c04f743520 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -12,7 +12,6 @@
 #define __SILK_H
 
 #undef DEBUG
-#define CONFIG_R8A7794
 
 #include "rcar-gen2-common.h"
 
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 92b9f85f92..dadee2d58c 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -13,7 +13,6 @@
 #define __STOUT_H
 
 #undef DEBUG
-#define CONFIG_R8A7790
 
 #include "rcar-gen2-common.h"
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 52e7691c5d..5cd943e394 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1787,12 +1787,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
@@ -1959,7 +1953,6 @@ CONFIG_SF_DEFAULT_MODE
 CONFIG_SF_DEFAULT_SPEED
 CONFIG_SGI_IP28
 CONFIG_SH4_PCI
-CONFIG_SH73A0
 CONFIG_SH7751_PCI
 CONFIG_SH7752EVB
 CONFIG_SH7753EVB
-- 
2.15.0