CVS commit: src/sys/arch/evbarm/rpi

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Oct 26 10:03:13 UTC 2012

Modified Files:
        src/sys/arch/evbarm/rpi: rpi_machdep.c

Log Message:
Count the memory regions in bootconfig.dramblocks when using the VCPROP
information.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/rpi/rpi_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.15 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.16
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.15	Fri Oct 19 12:33:27 2012
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c	Fri Oct 26 10:03:13 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpi_machdep.c,v 1.15 2012/10/19 12:33:27 skrll Exp $	*/
+/*	$NetBSD: rpi_machdep.c,v 1.16 2012/10/26 10:03:13 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.15 2012/10/19 12:33:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.16 2012/10/26 10:03:13 skrll Exp $");
 
 #include "opt_evbarm_boardtype.h"
 
@@ -218,9 +218,12 @@ rpi_bootparams(void)
 		size_t n = vcprop_tag_resplen(&vptp_mem->tag) /
 		    sizeof(struct vcprop_memory);
 
+    		bootconfig.dramblocks = 0;
+
 		for (int i = 0; i < n && i < DRAM_BLOCKS; i++) {
 			bootconfig.dram[i].address = vptp_mem->mem[i].base;
 			bootconfig.dram[i].pages = atop(vptp_mem->mem[i].size);
+			bootconfig.dramblocks++;
 		}
 	}