rk29: Kconfig: support 1G memory

diff --git a/arch/arm/mach-rk29/Kconfig b/arch/arm/mach-rk29/Kconfig
index 3ebe36311d866fb7bb87c76636e5efe975ef1b97..eac7f56550a5ce7f61843a9e5bc00fc2c8b9f9f0 100755 (executable)
--- a/arch/arm/mach-rk29/Kconfig
+++ b/arch/arm/mach-rk29/Kconfig
@@ -142,9 +142,28 @@ config DDR_TYPE_DDR3_DEFAULT
 
 endchoice
 
+choice RK29_MEM_SIZE
+       prompt "DDR Memory Size"
+       default RK29_MEM_SIZE_512M
+       help
+         Select High Memory Support (from Kernel Features) for 1G memory.
+         Deselect High Memory Support for 512MB memory.
+
+config RK29_MEM_SIZE_512M
+       bool "512MB"
+       depends on !HIGHMEM
+
+config RK29_MEM_SIZE_1G
+       bool "1GB"
+       depends on HIGHMEM
+       select ZONE_DMA
+
+endchoice
+
 config RK29_MEM_SIZE_M
-       int "DDR Memory size (in MB)"
-       default 512
+       int
+       default 512 if RK29_MEM_SIZE_512M
+       default 1024 if RK29_MEM_SIZE_1G
 
 config DDR_SDRAM_FREQ
        int "DDR SDRAM frequence (in MHz)"