From d6790ac4058a36cbc989ef2290f27da902ad1cb7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=BB=84=E6=B6=9B?= <huangtao@rock-chips.com>
Date: Sun, 19 Dec 2010 14:55:42 +0800
Subject: [PATCH] rk29: update Kconfig

---
 arch/arm/Kconfig                          |  1 +
 arch/arm/configs/rk29_Winaccord_defconfig |  2 +-
 arch/arm/configs/rk29_sdk_defconfig       |  2 +-
 arch/arm/mach-rk29/Kconfig                | 18 ++++++++++++------
 arch/arm/mach-rk29/board-rk29-winaccord.c |  4 ++--
 arch/arm/mach-rk29/board-rk29sdk.c        |  4 ++--
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 02b744803efe..bf52ad84a3e3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -727,6 +727,7 @@ config ARCH_RK29
 	select GENERIC_CLOCKEVENTS
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_GIC
+	select PL330
 	help
 	  Support for Rockchip RK29 soc.
 
diff --git a/arch/arm/configs/rk29_Winaccord_defconfig b/arch/arm/configs/rk29_Winaccord_defconfig
index 6cc7b38da2e8..3b521d228b95 100644
--- a/arch/arm/configs/rk29_Winaccord_defconfig
+++ b/arch/arm/configs/rk29_Winaccord_defconfig
@@ -198,7 +198,7 @@ CONFIG_ARCH_RK29=y
 CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_MACH_RK29SDK is not set
 CONFIG_MACH_RK29WINACCORD=y
-CONFIG_MACH_RK29SDK_MEM_SIZE_M=512
+CONFIG_RK29_MEM_SIZE_M=512
 
 #
 # RK29 VPU (Video Processing Unit) support
diff --git a/arch/arm/configs/rk29_sdk_defconfig b/arch/arm/configs/rk29_sdk_defconfig
index 839a760cbc0a..98fae79d7a07 100755
--- a/arch/arm/configs/rk29_sdk_defconfig
+++ b/arch/arm/configs/rk29_sdk_defconfig
@@ -197,7 +197,7 @@ CONFIG_MMU=y
 CONFIG_ARCH_RK29=y
 CONFIG_WIFI_CONTROL_FUNC=y
 CONFIG_MACH_RK29SDK=y
-CONFIG_MACH_RK29SDK_MEM_SIZE_M=512
+CONFIG_RK29_MEM_SIZE_M=512
 
 #
 # RK29 VPU (Video Processing Unit) support
diff --git a/arch/arm/mach-rk29/Kconfig b/arch/arm/mach-rk29/Kconfig
index 4ecd991c4c9f..e7bc0ff9ee01 100644
--- a/arch/arm/mach-rk29/Kconfig
+++ b/arch/arm/mach-rk29/Kconfig
@@ -1,22 +1,26 @@
+if ARCH_RK29
+
+choice
+	prompt "Select Board Type"
+	depends on ARCH_RK29
+	default MACH_RK29SDK
+
 config MACH_RK29SDK
 	depends on ARCH_RK29
-	default y
 	bool "ROCKCHIP Board Rk29 For Sdk"
-        select PL330	
         help
 	  Support for the ROCKCHIP Board For Rk29 Sdk.
 
 config MACH_RK29WINACCORD
 	depends on ARCH_RK29
-	default y
 	bool "ROCKCHIP Board Rk29 For Winaccord"
-        select PL330	
         help
 	  Support for the ROCKCHIP Board For Rk29 Winaccord.
 
-config MACH_RK29SDK_MEM_SIZE_M
+endchoice
+
+config RK29_MEM_SIZE_M
 	int "Memory size (in MiB)"
-	depends on MACH_RK29SDK || MACH_RK29WINACCORD
 	default 512
 
 config WIFI_CONTROL_FUNC
@@ -48,3 +52,5 @@ config RK29_VPU_HW_PERFORMANCE
           say N here.  This enables RK29 VPU driver HW_PERFORMANCE ioctl.
 
 endmenu
+
+endif
diff --git a/arch/arm/mach-rk29/board-rk29-winaccord.c b/arch/arm/mach-rk29/board-rk29-winaccord.c
index 3749d28e0296..1e1d381b5552 100644
--- a/arch/arm/mach-rk29/board-rk29-winaccord.c
+++ b/arch/arm/mach-rk29/board-rk29-winaccord.c
@@ -52,8 +52,8 @@
 
 
 /* Set memory size of pmem */
-#ifdef CONFIG_MACH_RK29SDK_MEM_SIZE_M
-#define SDRAM_SIZE          (CONFIG_MACH_RK29SDK_MEM_SIZE_M * SZ_1M)
+#ifdef CONFIG_RK29_MEM_SIZE_M
+#define SDRAM_SIZE          (CONFIG_RK29_MEM_SIZE_M * SZ_1M)
 #else
 #define SDRAM_SIZE          SZ_512M
 #endif
diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index bb72d4924b2c..680ef50b1684 100644
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -52,8 +52,8 @@
 
 
 /* Set memory size of pmem */
-#ifdef CONFIG_MACH_RK29SDK_MEM_SIZE_M
-#define SDRAM_SIZE          (CONFIG_MACH_RK29SDK_MEM_SIZE_M * SZ_1M)
+#ifdef CONFIG_RK29_MEM_SIZE_M
+#define SDRAM_SIZE          (CONFIG_RK29_MEM_SIZE_M * SZ_1M)
 #else
 #define SDRAM_SIZE          SZ_512M
 #endif
-- 
2.34.1