diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-04-24 14:04:05 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-04-24 14:04:05 -0400 |
commit | a086ee2268abcfcbf80a114f4602e5b26aa80bf0 (patch) | |
tree | fe027181ea37e00e85040977788cad82aa3faea5 /arch/blackfin/Kconfig | |
parent | a81501af19830ff43688781edad7e9c0cbd668af (diff) |
[Blackfin] arch: detect the memory available in the system on the fly by default
detect the memory available in the system on the fly by default
rather than forcing people to set this manually in the kconfig
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/Kconfig')
-rw-r--r-- | arch/blackfin/Kconfig | 26 |
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 | |||
294 | are also not changed, and the Bootloader does 100% of the hardware | 294 | are also not changed, and the Bootloader does 100% of the hardware |
295 | configuration. | 295 | configuration. |
296 | 296 | ||
297 | config MEM_SIZE | ||
298 | int "SDRAM Memory Size in MBytes" | ||
299 | depends on BFIN_KERNEL_CLOCK | ||
300 | default 64 | ||
301 | |||
297 | config MEM_ADD_WIDTH | 302 | config MEM_ADD_WIDTH |
298 | int "Memory Address Width" | 303 | int "Memory Address Width" |
299 | depends on BFIN_KERNEL_CLOCK | 304 | depends on BFIN_KERNEL_CLOCK |
@@ -373,6 +378,14 @@ config SCLK_DIV | |||
373 | This can be between 1 and 15 | 378 | This can be between 1 and 15 |
374 | System Clock = (PLL frequency) / (this setting) | 379 | System Clock = (PLL frequency) / (this setting) |
375 | 380 | ||
381 | config MAX_MEM_SIZE | ||
382 | int "Max SDRAM Memory Size in MBytes" | ||
383 | depends on !BFIN_KERNEL_CLOCK && !MPU | ||
384 | default 512 | ||
385 | help | ||
386 | This is the max memory size that the kernel will create CPLB | ||
387 | tables for. Your system will not be able to handle any more. | ||
388 | |||
376 | # | 389 | # |
377 | # Max & Min Speeds for various Chips | 390 | # Max & Min Speeds for various Chips |
378 | # | 391 | # |
@@ -441,19 +454,6 @@ source kernel/time/Kconfig | |||
441 | 454 | ||
442 | comment "Memory Setup" | 455 | comment "Memory Setup" |
443 | 456 | ||
444 | config MEM_SIZE | ||
445 | int "SDRAM Memory Size in MBytes" | ||
446 | default 32 if BFIN533_EZKIT | ||
447 | default 64 if BFIN527_EZKIT | ||
448 | default 64 if BFIN537_STAMP | ||
449 | default 64 if BFIN548_EZKIT | ||
450 | default 64 if BFIN561_EZKIT | ||
451 | default 128 if BFIN533_STAMP | ||
452 | default 64 if PNAV10 | ||
453 | default 32 if H8606_HVSISTEMAS | ||
454 | default 64 if BFIN548_BLUETECHNIX_CM | ||
455 | default 64 if BFIN532_IP0X | ||
456 | |||
457 | choice | 457 | choice |
458 | prompt "DDR SDRAM Chip Type" | 458 | prompt "DDR SDRAM Chip Type" |
459 | depends on (BFIN548_EZKIT || BFIN548_BLUETECHNIX_CM) | 459 | depends on (BFIN548_EZKIT || BFIN548_BLUETECHNIX_CM) |