From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 2 Jul 2014 14:07:50 +0000 (+0100)
Subject: hw/arm/vexpress: Alias NOR flash at 0 for vexpress-a9
X-Git-Tag: qemu-xen-4.6.0-rc1~321^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6ec1588e09770ac7e9c60194faff6101111fc7f0;p=qemu-upstream-4.6-testing.git

hw/arm/vexpress: Alias NOR flash at 0 for vexpress-a9

Make the vexpress-a9 board alias the first NOR flash region at
address zero, like vexpress-a15. This makes "-bios" actually usable
on this board.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1404310070-3561-1-git-send-email-peter.maydell@linaro.org
Reviewed-by: Greg Bellows <greg.bellows@linaro.org>
---

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 3d83e6c98..a88732c7e 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -84,6 +84,7 @@ enum {
 };
 
 static hwaddr motherboard_legacy_map[] = {
+    [VE_NORFLASHALIAS] = 0,
     /* CS7: 0x10000000 .. 0x10020000 */
     [VE_SYSREGS] = 0x10000000,
     [VE_SP810] = 0x10001000,
@@ -114,7 +115,6 @@ static hwaddr motherboard_legacy_map[] = {
     [VE_VIDEORAM] = 0x4c000000,
     [VE_ETHERNET] = 0x4e000000,
     [VE_USB] = 0x4f000000,
-    [VE_NORFLASHALIAS] = -1, /* not present */
 };
 
 static hwaddr motherboard_aseries_map[] = {