[PATCH] z2: Make providing flash images non-mandatory

[PATCH] z2: Make providing flash images non-mandatory

[Guenter Roeck]

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>
---
 hw/arm/z2.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 34794fe3ae..4bb237f22d 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)) {
-- 
2.17.1

Re: [PATCH] z2: Make providing flash images non-mandatory

[Philippe Mathieu-Daudé]

On 2/17/20 10:09 PM, Guenter Roeck wrote:
> 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>
> ---
>   hw/arm/z2.c | 6 ------
>   1 file changed, 6 deletions(-)
> 
> diff --git a/hw/arm/z2.c b/hw/arm/z2.c
> index 34794fe3ae..4bb237f22d 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)) {
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH] z2: Make providing flash images non-mandatory

[Peter Maydell]

On Mon, 17 Feb 2020 at 21:09, Guenter Roeck <linux@roeck-us.net> wrote:
>
> 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>
> ---
>  hw/arm/z2.c | 6 ------
>  1 file changed, 6 deletions(-)



Applied to target-arm.next, thanks.

-- PMM