aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2012-01-21 12:13:13 -0500
committerRalf Baechle <ralf@linux-mips.org>2012-07-23 08:53:37 -0400
commit3e25f4f243db6495cf57c1fcb3a4c0311a92b203 (patch)
tree93131802cc60321053f93908ba2539f17692e87b
parent28a33cbc24e4256c143dce96c7d93bf423229f92 (diff)
MIPS: Alchemy: use 64MB RAM as minimum for devboards
YAMON on all devboards provides the "memsize" envvar; in the unlikely case that it can't be parsed just assume 64MB, which all boards have at least. Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3286/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/alchemy/devboards/prom.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/mips/alchemy/devboards/prom.c b/arch/mips/alchemy/devboards/prom.c
index 93a22107cc41..57320f205fc4 100644
--- a/arch/mips/alchemy/devboards/prom.c
+++ b/arch/mips/alchemy/devboards/prom.c
@@ -33,15 +33,6 @@
33#include <asm/mach-au1x00/au1000.h> 33#include <asm/mach-au1x00/au1000.h>
34#include <prom.h> 34#include <prom.h>
35 35
36#if defined(CONFIG_MIPS_DB1000) || \
37 defined(CONFIG_MIPS_PB1100) || \
38 defined(CONFIG_MIPS_PB1500)
39#define ALCHEMY_BOARD_DEFAULT_MEMSIZE 0x04000000
40
41#else /* Au1550/Au1200-based develboards */
42#define ALCHEMY_BOARD_DEFAULT_MEMSIZE 0x08000000
43#endif
44
45void __init prom_init(void) 36void __init prom_init(void)
46{ 37{
47 unsigned char *memsize_str; 38 unsigned char *memsize_str;
@@ -54,7 +45,7 @@ void __init prom_init(void)
54 prom_init_cmdline(); 45 prom_init_cmdline();
55 memsize_str = prom_getenv("memsize"); 46 memsize_str = prom_getenv("memsize");
56 if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize)) 47 if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize))
57 memsize = ALCHEMY_BOARD_DEFAULT_MEMSIZE; 48 memsize = 64 << 20; /* all devboards have at least 64MB RAM */
58 49
59 add_memory_region(0, memsize, BOOT_MEM_RAM); 50 add_memory_region(0, memsize, BOOT_MEM_RAM);
60} 51}