diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2020-02-17 13:09:03 -0800 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-21 16:07:00 +0000 |
| commit | 9e946eaba87916c43aaf0b2760bd5d5a54187c7b (patch) | |
| tree | 2d1e82dfd55d99bae4f950fa78e1ea04f10fc1ec /hw | |
| parent | d4cf262ab5b057dff0dff86e90de9b1b8a32b307 (diff) | |
| download | qemu-9e946eaba87916c43aaf0b2760bd5d5a54187c7b.zip qemu-9e946eaba87916c43aaf0b2760bd5d5a54187c7b.tar.gz qemu-9e946eaba87916c43aaf0b2760bd5d5a54187c7b.tar.bz2 | |
z2: Make providing flash images non-mandatory
Up to now, the z2 machine only boots if a flash image is provided.
This is not really necessary; the machine can boot from initrd or from
SD without it. At the same time, having to provide dummy flash images
is a nuisance and does not add any real value. Make it optional.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200217210903.18602-1-linux@roeck-us.net
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/z2.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 34794fe..4bb237f 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -314,12 +314,6 @@ static void z2_init(MachineState *machine) be = 0; #endif dinfo = drive_get(IF_PFLASH, 0, 0); - if (!dinfo && !qtest_enabled()) { - error_report("Flash image must be given with the " - "'pflash' parameter"); - exit(1); - } - if (!pflash_cfi01_register(Z2_FLASH_BASE, "z2.flash0", Z2_FLASH_SIZE, dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, sector_len, 4, 0, 0, 0, 0, be)) { |