summaryrefslogtreecommitdiffstats
path: root/arch/mips/alchemy
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2012-01-21 18:13:13 +0100
committerRalf Baechle <ralf@linux-mips.org>2012-07-23 13:53:37 +0100
commit3e25f4f243db6495cf57c1fcb3a4c0311a92b203 (patch)
tree93131802cc60321053f93908ba2539f17692e87b /arch/mips/alchemy
parent28a33cbc24e4256c143dce96c7d93bf423229f92 (diff)
downloadop-kernel-dev-3e25f4f243db6495cf57c1fcb3a4c0311a92b203.zip
op-kernel-dev-3e25f4f243db6495cf57c1fcb3a4c0311a92b203.tar.gz
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>
Diffstat (limited to 'arch/mips/alchemy')
-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 93a2210..57320f2 100644
--- a/arch/mips/alchemy/devboards/prom.c
+++ b/arch/mips/alchemy/devboards/prom.c
@@ -33,15 +33,6 @@
#include <asm/mach-au1x00/au1000.h>
#include <prom.h>
-#if defined(CONFIG_MIPS_DB1000) || \
- defined(CONFIG_MIPS_PB1100) || \
- defined(CONFIG_MIPS_PB1500)
-#define ALCHEMY_BOARD_DEFAULT_MEMSIZE 0x04000000
-
-#else /* Au1550/Au1200-based develboards */
-#define ALCHEMY_BOARD_DEFAULT_MEMSIZE 0x08000000
-#endif
-
void __init prom_init(void)
{
unsigned char *memsize_str;
@@ -54,7 +45,7 @@ void __init prom_init(void)
prom_init_cmdline();
memsize_str = prom_getenv("memsize");
if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize))
- memsize = ALCHEMY_BOARD_DEFAULT_MEMSIZE;
+ memsize = 64 << 20; /* all devboards have at least 64MB RAM */
add_memory_region(0, memsize, BOOT_MEM_RAM);
}
OpenPOWER on IntegriCloud