From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 13 Jul 2011 06:13:21 +0000 (+0800)
Subject: Revert "rk29: Kconfig: support 1G memory"
X-Git-Tag: firefly_0821_release~10136^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1b722313f9a600c6bba0ec091d44d85a9e8a34de;p=firefly-linux-kernel-4.4.55.git

Revert "rk29: Kconfig: support 1G memory"

This reverts commit d11238ad51fd172858986b3c264176efb23295c5.
---

diff --git a/arch/arm/mach-rk29/Kconfig b/arch/arm/mach-rk29/Kconfig
index 43551408017b..6f1ceb62a229 100755
--- a/arch/arm/mach-rk29/Kconfig
+++ b/arch/arm/mach-rk29/Kconfig
@@ -142,28 +142,9 @@ 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
-	default 512 if RK29_MEM_SIZE_512M
-	default 1024 if RK29_MEM_SIZE_1G
+	int "DDR Memory size (in MB)"
+	default 512
 
 config DDR_SDRAM_FREQ
 	int "DDR SDRAM frequence (in MHz)"