* [PATCH] mainstone: Make providing flash images non-mandatory
@ 2020-02-17 21:08 Guenter Roeck
2020-02-18 6:38 ` Philippe Mathieu-Daudé
2020-02-18 16:12 ` Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Guenter Roeck @ 2020-02-17 21:08 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-arm, qemu-devel, Guenter Roeck
Up to now, the mainstone machine only boots if two flash images are
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/mainstone.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index b01ce3ce08..6e64dfab50 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -138,19 +138,10 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
/* There are two 32MiB flash devices on the board */
for (i = 0; i < 2; i ++) {
dinfo = drive_get(IF_PFLASH, 0, i);
- if (!dinfo) {
- if (qtest_enabled()) {
- break;
- }
- error_report("Two flash images must be given with the "
- "'pflash' parameter");
- exit(1);
- }
-
if (!pflash_cfi01_register(mainstone_flash_base[i],
i ? "mainstone.flash1" : "mainstone.flash0",
MAINSTONE_FLASH,
- blk_by_legacy_dinfo(dinfo),
+ dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
sector_len, 4, 0, 0, 0, 0, be)) {
error_report("Error registering flash memory");
exit(1);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mainstone: Make providing flash images non-mandatory
2020-02-17 21:08 [PATCH] mainstone: Make providing flash images non-mandatory Guenter Roeck
@ 2020-02-18 6:38 ` Philippe Mathieu-Daudé
2020-02-18 16:12 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-18 6:38 UTC (permalink / raw)
To: Guenter Roeck, Peter Maydell; +Cc: qemu-arm, qemu-devel
On 2/17/20 10:08 PM, Guenter Roeck wrote:
> Up to now, the mainstone machine only boots if two flash images are
> 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/mainstone.c | 11 +----------
> 1 file changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
> index b01ce3ce08..6e64dfab50 100644
> --- a/hw/arm/mainstone.c
> +++ b/hw/arm/mainstone.c
> @@ -138,19 +138,10 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
> /* There are two 32MiB flash devices on the board */
> for (i = 0; i < 2; i ++) {
> dinfo = drive_get(IF_PFLASH, 0, i);
> - if (!dinfo) {
> - if (qtest_enabled()) {
> - break;
> - }
> - error_report("Two flash images must be given with the "
> - "'pflash' parameter");
> - exit(1);
> - }
> -
> if (!pflash_cfi01_register(mainstone_flash_base[i],
> i ? "mainstone.flash1" : "mainstone.flash0",
> MAINSTONE_FLASH,
> - blk_by_legacy_dinfo(dinfo),
> + dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> sector_len, 4, 0, 0, 0, 0, be)) {
> error_report("Error registering flash memory");
> exit(1);
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mainstone: Make providing flash images non-mandatory
2020-02-17 21:08 [PATCH] mainstone: Make providing flash images non-mandatory Guenter Roeck
2020-02-18 6:38 ` Philippe Mathieu-Daudé
@ 2020-02-18 16:12 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2020-02-18 16:12 UTC (permalink / raw)
To: Guenter Roeck; +Cc: qemu-arm, QEMU Developers
On Mon, 17 Feb 2020 at 21:08, Guenter Roeck <linux@roeck-us.net> wrote:
>
> Up to now, the mainstone machine only boots if two flash images are
> 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/mainstone.c | 11 +----------
> 1 file changed, 1 insertion(+), 10 deletions(-)
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-18 16:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-17 21:08 [PATCH] mainstone: Make providing flash images non-mandatory Guenter Roeck
2020-02-18 6:38 ` Philippe Mathieu-Daudé
2020-02-18 16:12 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).