1 files changed, 13 insertions, 13 deletions

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 308bbe291d8f..75bceee9b9a5 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -294,6 +294,11 @@ config BFIN_KERNEL_CLOCK
           are also not changed, and the Bootloader does 100% of the hardware
           configuration.
 
+config MEM_SIZE
+        int "SDRAM Memory Size in MBytes"
+        depends on BFIN_KERNEL_CLOCK
+        default 64
+
 config MEM_ADD_WIDTH
         int "Memory Address Width"
         depends on BFIN_KERNEL_CLOCK
@@ -373,6 +378,14 @@ config SCLK_DIV
           This can be between 1 and 15
           System Clock = (PLL frequency) / (this setting)
 
+config MAX_MEM_SIZE
+        int "Max SDRAM Memory Size in MBytes"
+        depends on !BFIN_KERNEL_CLOCK && !MPU
+        default 512
+        help
+          This is the max memory size that the kernel will create CPLB
+          tables for.  Your system will not be able to handle any more.
+
 #
 # Max & Min Speeds for various Chips
 #
@@ -441,19 +454,6 @@ source kernel/time/Kconfig
 
 comment "Memory Setup"
 
-config MEM_SIZE
-        int "SDRAM Memory Size in MBytes"
-        default  32 if BFIN533_EZKIT
-        default  64 if BFIN527_EZKIT
-        default  64 if BFIN537_STAMP
-        default  64 if BFIN548_EZKIT
-        default  64 if BFIN561_EZKIT
-        default 128 if BFIN533_STAMP
-        default  64 if PNAV10
-        default  32 if H8606_HVSISTEMAS
-        default  64 if BFIN548_BLUETECHNIX_CM
-        default  64 if BFIN532_IP0X
-
 choice
         prompt "DDR SDRAM Chip Type"
         depends on (BFIN548_EZKIT || BFIN548_BLUETECHNIX_CM)