From: David Engraf Date: Mon, 15 Jul 2019 13:17:04 +0000 (+0100) Subject: hw/arm/virt: Fix non-secure flash mode X-Git-Tag: v4.1.0-rc1~8^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80734cbdcab6ddb8d45a75910e8f7e3841daca2c;p=thirdparty%2Fqemu.git hw/arm/virt: Fix non-secure flash mode Using the whole 128 MiB flash in non-secure mode is not working because virt_flash_fdt() expects the same address for secure_sysmem and sysmem. This is not correctly handled by caller because it forwards NULL for secure_sysmem in non-secure flash mode. Fixed by using sysmem when secure_sysmem is NULL. Signed-off-by: David Engraf Message-id: 20190712075002.14326-1-david.engraf@sysgo.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0b5138cb22c..d9496c93634 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1674,7 +1674,7 @@ static void machvirt_init(MachineState *machine) &machine->device_memory->mr); } - virt_flash_fdt(vms, sysmem, secure_sysmem); + virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem); create_gic(vms, pic);