From e25f472d86cf9ec2af992554c06e64915d4f2569 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=BB=84=E6=B6=9B?= <huangtao@rock-chips.com>
Date: Mon, 22 Oct 2012 10:55:33 +0800
Subject: [PATCH] rk: Kconfig add rk3108 support and add SOC_RKXXXX config

---
 arch/arm/Kconfig           |  4 ++--
 arch/arm/mach-rk30/Kconfig | 49 +++++++++++++++++++++++++++++++-------
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 64513a1050f8..52b9f6e0441e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -883,7 +883,7 @@ config ARCH_RK2928
 	  Support for Rockchip's RK2928 SoCs.
 
 config ARCH_RK30
-	bool "Rockchip RK30xx"
+	bool "Rockchip RK30xx/RK31xx"
 	select PLAT_RK
 	select CPU_V7
 	select ARM_GIC
@@ -893,7 +893,7 @@ config ARCH_RK30
 	select ARM_ERRATA_764369
 	select ARM_ERRATA_754322
 	help
-	  Support for Rockchip's RK30xx SoCs.
+	  Support for Rockchip's RK30xx/RK31xx SoCs.
 
 config PLAT_SPEAR
 	bool "ST SPEAr"
diff --git a/arch/arm/mach-rk30/Kconfig b/arch/arm/mach-rk30/Kconfig
index c066c7a4ec6c..4b3e38644d64 100755
--- a/arch/arm/mach-rk30/Kconfig
+++ b/arch/arm/mach-rk30/Kconfig
@@ -1,14 +1,36 @@
 if ARCH_RK30
 
-config ARCH_RK3066B
-	bool "Rockchip RK3066B"
-	help
-	  Support for Rockchip's RK3066B SoCs.
-
 config ARCH_RK30XX
 	bool
-	default y
-	depends on !ARCH_RK3066B
+
+config ARCH_RK3066B
+	bool
+
+choice
+	prompt "Rockchip SoC Type"
+	default SOC_RK3066
+
+config SOC_RK3000
+	bool "RK3000"
+	select ARCH_RK30XX
+
+config SOC_RK3066
+	bool "RK3066"
+	select ARCH_RK30XX
+
+config SOC_RK3068
+	bool "RK3068"
+	select ARCH_RK30XX
+
+config SOC_RK3066B
+	bool "RK3066B"
+	select ARCH_RK3066B
+
+config SOC_RK3108
+	bool "RK3108"
+	select ARCH_RK3066B
+
+endchoice
 
 if ARCH_RK30XX
 
@@ -55,8 +77,7 @@ endif
 
 endif
 
-if ARCH_RK3066B
-
+if SOC_RK3066B
 choice
 	prompt "RK3066B Board Type"
 
@@ -66,11 +87,21 @@ config MACH_RK3066B_FPGA
 
 config MACH_RK3066B_SDK
 	bool "RK3066B SDK board"
+
 config MACH_RK3066B_M701
 	bool "RK3066B M701 board"
 
 endchoice
+endif
+
+if SOC_RK3108
+choice
+	prompt "RK3108 Board Type"
 
+config MACH_RK3108_TB
+	bool "RK3108 Top Board"
+
+endchoice
 endif
 
 endif
-- 
2.34.1