[src/trunk]: src/sys/arch/evbarm/beagle Allow MEMSIZE to only lower the amoun...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab674cab9d6f
branches:  trunk
changeset: 783276:ab674cab9d6f
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Dec 13 01:23:16 2012 +0000

description:
Allow MEMSIZE to only lower the amount of memory probed, not increase it.

diffstat:

 sys/arch/evbarm/beagle/beagle_machdep.c |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 2dddae11c4f2 -r ab674cab9d6f sys/arch/evbarm/beagle/beagle_machdep.c
--- a/sys/arch/evbarm/beagle/beagle_machdep.c   Thu Dec 13 01:16:39 2012 +0000
+++ b/sys/arch/evbarm/beagle/beagle_machdep.c   Thu Dec 13 01:23:16 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: beagle_machdep.c,v 1.28 2012/12/13 01:16:39 matt Exp $ */
+/*     $NetBSD: beagle_machdep.c,v 1.29 2012/12/13 01:23:16 matt Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.28 2012/12/13 01:16:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.29 2012/12/13 01:23:16 matt Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -383,7 +383,7 @@
 u_int
 initarm(void *arg)
 {
-       psize_t ram_size;
+       psize_t ram_size = 0;
 #if 1
        beagle_putchar('d');
 #endif
@@ -442,9 +442,13 @@
         */
 #if defined(OMAP_3530) || defined(OMAP_3430)
        ram_size = omap3530_memprobe();
-#else
-       ram_size = MEMSIZE * 1024 * 1024;
 #endif
+       /*
+        * If MEMSIZE specified less than what we really have, limit ourselves
+        * to that.
+        */
+       if (ram_size == 0 || ram_size > MEMSIZE * 1024 * 1024)
+               ram_size = MEMSIZE * 1024 * 1024;
 
        /* Fake bootconfig structure for the benefit of pmap.c. */
        bootconfig.dramblocks = 1;