From c5ac105b874988e5f6758054ef3c8cdbec538e30 Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Mon, 8 Nov 2010 17:23:52 +0900 Subject: [PATCH] --- yaml --- r: 223333 b: refs/heads/master c: 690ca2ce0c824e8d3da7b2e273c2c873ab96d1e6 h: refs/heads/master i: 223331: 414b4ac75b631dba26a864760b46b6f22ff898a2 v: v3 --- [refs] | 2 +- trunk/arch/mips/alchemy/devboards/prom.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf8bd895b1e4..4199599eb652 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec79812580e360081b58c3e2e8b5b69b8080b5a0 +refs/heads/master: 690ca2ce0c824e8d3da7b2e273c2c873ab96d1e6 diff --git a/trunk/arch/mips/alchemy/devboards/prom.c b/trunk/arch/mips/alchemy/devboards/prom.c index b30df5c97ad3..baeb21385058 100644 --- a/trunk/arch/mips/alchemy/devboards/prom.c +++ b/trunk/arch/mips/alchemy/devboards/prom.c @@ -54,10 +54,9 @@ void __init prom_init(void) prom_init_cmdline(); memsize_str = prom_getenv("memsize"); - if (!memsize_str) + if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize)) memsize = ALCHEMY_BOARD_DEFAULT_MEMSIZE; - else - strict_strtoul(memsize_str, 0, &memsize); + add_memory_region(0, memsize, BOOT_MEM_RAM); }