Commit 80734cbd authored by David Engraf's avatar David Engraf Committed by Peter Maydell
Browse files

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: default avatarDavid Engraf <david.engraf@sysgo.com>
Message-id: 20190712075002.14326-1-david.engraf@sysgo.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent a09ef504

hw/arm/virt.c

+1 −1
Original line number Diff line number Diff line
@@ -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);