rk29: update Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 02b744803efeb7cd567be4d355fefa4ef1d60ca9..bf52ad84a3e35661e6856ebaa7b2aebf8e99528d 100644 (file)
--- 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 6cc7b38da2e8b6a5a4e1e9cd7d1712192dc338a5..3b521d228b95317b08c92358dfaa6ef54cd00af3 100644 (file)
--- 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 839a760cbc0a8a93f2a36b87076bdd52b7959d87..98fae79d7a0794f53d147d8e0eea3044d12d51ef 100755 (executable)
--- 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 4ecd991c4c9f05c4f407c8c0cd6e88bc2105d1df..e7bc0ff9ee01c16ec453b58d3cce3b0fdf77c9ce 100644 (file)
--- 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 3749d28e0296e27bc5dcaf03a8ed9cfae9536c3f..1e1d381b55524846190d99bd54a443d914061b05 100644 (file)
--- 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 bb72d4924b2c0f3452ae82527a0caaef6ee0b470..680ef50b1684e572aa1d2e10ee386e19ef0f4f0a 100644 (file)
--- 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