From 7a500a7a78002b470800794f615b8dca251816c7 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Fri, 17 Jun 2016 13:52:13 +0900
Subject: [PATCH] ARM: rmobile: Create R-Car 32bit (Gen1 and Gen2) for Kconfig

This creates Kconfig of R-Car 32bit for Kconfig of R-Car 64bit (Gen3).

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 arch/arm/Kconfig                 |  1 -
 arch/arm/mach-rmobile/Kconfig    | 87 +++---------------------------
 arch/arm/mach-rmobile/Kconfig.32 | 90 ++++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+), 82 deletions(-)
 create mode 100644 arch/arm/mach-rmobile/Kconfig.32

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 413d269d26..8c867b26da 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -577,7 +577,6 @@ config AM43XX
 
 config ARCH_RMOBILE
 	bool "Renesas ARM SoCs"
-	select CPU_V7
 	select DM
 	select DM_SERIAL
 
diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
index 5915768928..56c3f68d3c 100644
--- a/arch/arm/mach-rmobile/Kconfig
+++ b/arch/arm/mach-rmobile/Kconfig
@@ -1,90 +1,15 @@
 if ARCH_RMOBILE
 
 choice
-	prompt "Renesus ARM SoCs board select"
-	optional
+	prompt "Target Renesas SoC select"
+	default RCAR_32
 
-config TARGET_ARMADILLO_800EVA
-	bool "armadillo 800 eva board"
-
-config TARGET_GOSE
-	bool "Gose board"
-	select DM
-	select DM_SERIAL
-
-config TARGET_KOELSCH
-	bool "Koelsch board"
-	select DM
-	select DM_SERIAL
-
-config TARGET_LAGER
-	bool "Lager board"
-	select DM
-	select DM_SERIAL
-
-config TARGET_KZM9G
-	bool "KZM9D board"
-
-config TARGET_ALT
-	bool "Alt board"
-	select DM
-	select DM_SERIAL
-
-config TARGET_SILK
-	bool "Silk board"
-	select DM
-	select DM_SERIAL
-
-config TARGET_PORTER
-	bool "Porter board"
-	select DM
-	select DM_SERIAL
-
-config TARGET_STOUT
-	bool "Stout board"
-	select DM
-	select DM_SERIAL
-
-endchoice
-
-config SYS_SOC
-	default "rmobile"
-
-config RMOBILE_EXTRAM_BOOT
-	bool "Enable boot from RAM"
-	depends on TARGET_ALT || TARGET_KOELSCH || TARGET_LAGER || TARGET_PORTER || TARGET_SILK || TARGET_STOUT
-	default n
-
-choice
-	prompt "Qos setting primary"
-	depends on TARGET_ALT || TARGET_GOSE || TARGET_KOELSCH || TARGET_LAGER
-	default QOS_PRI_NORMAL
-
-config QOS_PRI_NORMAL
-	bool "Non primary"
-	help
-	   Select normal mode for QoS setting.
-
-config QOS_PRI_MEDIA
-	bool "Media primary"
-	help
-	   Select multimedia primary mode for QoS setting.
-
-config QOS_PRI_GFX
-	bool "GFX primary"
-	help
-	   Select GFX(graphics) primary mode for QoS setting.
+config RCAR_32
+	bool "Renesas ARM SoCs R-Car Gen1/Gen2 (32bit)"
+	select CPU_V7
 
 endchoice
 
-source "board/atmark-techno/armadillo-800eva/Kconfig"
-source "board/renesas/gose/Kconfig"
-source "board/renesas/koelsch/Kconfig"
-source "board/renesas/lager/Kconfig"
-source "board/kmc/kzm9g/Kconfig"
-source "board/renesas/alt/Kconfig"
-source "board/renesas/silk/Kconfig"
-source "board/renesas/porter/Kconfig"
-source "board/renesas/stout/Kconfig"
+source "arch/arm/mach-rmobile/Kconfig.32"
 
 endif
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
new file mode 100644
index 0000000000..b485953410
--- /dev/null
+++ b/arch/arm/mach-rmobile/Kconfig.32
@@ -0,0 +1,90 @@
+if RCAR_32
+
+choice
+	prompt "Renesus ARM SoCs board select"
+	optional
+
+config TARGET_ARMADILLO_800EVA
+	bool "armadillo 800 eva board"
+
+config TARGET_GOSE
+	bool "Gose board"
+	select DM
+	select DM_SERIAL
+
+config TARGET_KOELSCH
+	bool "Koelsch board"
+	select DM
+	select DM_SERIAL
+
+config TARGET_LAGER
+	bool "Lager board"
+	select DM
+	select DM_SERIAL
+
+config TARGET_KZM9G
+	bool "KZM9D board"
+
+config TARGET_ALT
+	bool "Alt board"
+	select DM
+	select DM_SERIAL
+
+config TARGET_SILK
+	bool "Silk board"
+	select DM
+	select DM_SERIAL
+
+config TARGET_PORTER
+	bool "Porter board"
+	select DM
+	select DM_SERIAL
+
+config TARGET_STOUT
+	bool "Stout board"
+	select DM
+	select DM_SERIAL
+
+endchoice
+
+config SYS_SOC
+	default "rmobile"
+
+config RMOBILE_EXTRAM_BOOT
+	bool "Enable boot from RAM"
+	depends on TARGET_ALT || TARGET_KOELSCH || TARGET_LAGER || TARGET_PORTER || TARGET_SILK || TARGET_STOUT
+	default n
+
+choice
+	prompt "Qos setting primary"
+	depends on TARGET_ALT || TARGET_GOSE || TARGET_KOELSCH || TARGET_LAGER
+	default QOS_PRI_NORMAL
+
+config QOS_PRI_NORMAL
+	bool "Non primary"
+	help
+	   Select normal mode for QoS setting.
+
+config QOS_PRI_MEDIA
+	bool "Media primary"
+	help
+	   Select multimedia primary mode for QoS setting.
+
+config QOS_PRI_GFX
+	bool "GFX primary"
+	help
+	   Select GFX(graphics) primary mode for QoS setting.
+
+endchoice
+
+source "board/atmark-techno/armadillo-800eva/Kconfig"
+source "board/renesas/gose/Kconfig"
+source "board/renesas/koelsch/Kconfig"
+source "board/renesas/lager/Kconfig"
+source "board/kmc/kzm9g/Kconfig"
+source "board/renesas/alt/Kconfig"
+source "board/renesas/silk/Kconfig"
+source "board/renesas/porter/Kconfig"
+source "board/renesas/stout/Kconfig"
+
+endif
-- 
2.25.1