[coreboot-gerrit] New patch to review for coreboot: 7e28618 qemu-armv7: fix cbmem

[Aaron Durbin (adurbin@google.com)]

Aaron Durbin (adurbin at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9123

-gerrit

commit 7e28618159ee23a2ed58d9c50ba054ce1f9635c9
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Tue Mar 24 22:28:41 2015 -0500

    qemu-armv7: fix cbmem
    
    Change-Id: I472bf84a11863d72cd8010b922ec484f128d961a
---
 src/mainboard/emulation/qemu-armv7/cbmem.c    | 2 +-
 src/mainboard/emulation/qemu-armv7/romstage.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/emulation/qemu-armv7/cbmem.c b/src/mainboard/emulation/qemu-armv7/cbmem.c
index 84f88cf..29a8afa 100644
--- a/src/mainboard/emulation/qemu-armv7/cbmem.c
+++ b/src/mainboard/emulation/qemu-armv7/cbmem.c
@@ -20,5 +20,5 @@
 
 void *cbmem_top(void)
 {
-	return (void *)CONFIG_SYS_SDRAM_BASE + (CONFIG_DRAM_SIZE_MB << 20);
+	return (void *)(20 << 20);
 }
diff --git a/src/mainboard/emulation/qemu-armv7/romstage.c b/src/mainboard/emulation/qemu-armv7/romstage.c
index b6314ccd..4c55f40 100644
--- a/src/mainboard/emulation/qemu-armv7/romstage.c
+++ b/src/mainboard/emulation/qemu-armv7/romstage.c
@@ -15,9 +15,15 @@
 
 #include <console/console.h>
 #include <program_loading.h>
+#include <cbmem.h>
 
 void main(void)
 {
 	console_init();
+	cbmem_initialize_empty();
+	cbmem_add(0xaaaa, 0x1234);
+	cbmem_add(0xaaa0, 0x14);
+	cbmem_add(0xaaa1, 0x14);
+	cbmem_add(0xaaa2, 0x100);
 	run_ramstage();
 }