[Qemu-devel] [PATCH for-2.1] hw/arm/vexpress: Alias NOR flash at 0 for vexpress-a9

[Qemu-devel] [PATCH for-2.1] hw/arm/vexpress: Alias NOR flash at 0 for vexpress-a9

[Peter Maydell]

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>
---
Looking back through the archives to 2012 when the vexpress-a15
flash alias went in, I seem to have been under the impression that
the A9 daughterboard didn't have a similar alias, but it does.
(For both boards, there is a mechanism for letting the guest
dynamically remap lowmem which we don't implement; the rationale
for defaulting to flash at 0 holds for both.)

This is a fairly long standing bug but it's more interesting
now we support -bios on this board which is a new-in-2.1 thing.
Hence the for-2.1 tag.
---
 hw/arm/vexpress.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 3d83e6c..a88732c 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[] = {
-- 
2.0.0

Re: [Qemu-devel] [PATCH for-2.1] hw/arm/vexpress: Alias NOR flash at 0 for vexpress-a9

[Greg Bellows]

[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]

Reviewed-by: Greg Bellows <greg.bellows@linaro.org>


On 2 July 2014 09:07, Peter Maydell <peter.maydell@linaro.org> wrote:

> 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>
> ---
> Looking back through the archives to 2012 when the vexpress-a15
> flash alias went in, I seem to have been under the impression that
> the A9 daughterboard didn't have a similar alias, but it does.
> (For both boards, there is a mechanism for letting the guest
> dynamically remap lowmem which we don't implement; the rationale
> for defaulting to flash at 0 holds for both.)
>
> This is a fairly long standing bug but it's more interesting
> now we support -bios on this board which is a new-in-2.1 thing.
> Hence the for-2.1 tag.
> ---
>  hw/arm/vexpress.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
> index 3d83e6c..a88732c 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[] = {
> --
> 2.0.0
>
>
>

[-- Attachment #2: Type: text/html, Size: 2260 bytes --]