diff --git a/src/mainboard/emulation/qemu-armv7/memlayout.ld b/src/mainboard/emulation/qemu-armv7/memlayout.ld
index 9d76d9d..4ddc6d2 100644
--- a/src/mainboard/emulation/qemu-armv7/memlayout.ld
+++ b/src/mainboard/emulation/qemu-armv7/memlayout.ld
@@ -28,14 +28,16 @@
 {
 	/* TODO: does this thing emulate SRAM? */
 
-	BOOTBLOCK(0x00000, 64K)
-	FMAP_CACHE(0x10000, 2K)
+	REGION(flash, 0, CONFIG_ROM_SIZE, 4K)
 
 	DRAM_START(0x60000000)
 	STACK(0x60000000, 64K)
-	ROMSTAGE(0x60010000, 128K)
-	RAMSTAGE(0x60030000, 16M)
-
+	BOOTBLOCK(0x60010000, 128K)
+	FMAP_CACHE(0x60030000, 4K)
+	TIMESTAMP(0x60031000, 1K)
 	/* TODO: Implement MMU support and move TTB to a better location. */
-	TTB(0x61030000, 16K)
+	TTB(0x60034000, 16K)
+	ROMSTAGE(0x60038000, 128K)
+	RAMSTAGE(0x60060000, 16M)
+	POSTRAM_CBFS_CACHE(0x61060000, 8M)
 }