diff options
| author | Gerd Hoffmann | 2020-09-15 14:08:49 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2020-09-17 14:16:19 +0200 |
| commit | 3bee1d1d14c583929af068d8fd6eef54d21046e4 (patch) | |
| tree | 006e5834586240b54f1953204720a6d8d80ac17e | |
| parent | Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20200915' int... (diff) | |
| download | qemu-3bee1d1d14c583929af068d8fd6eef54d21046e4.tar.gz qemu-3bee1d1d14c583929af068d8fd6eef54d21046e4.tar.xz qemu-3bee1d1d14c583929af068d8fd6eef54d21046e4.zip | |
microvm: name qboot binary qboot.rom
qboot isn't a bios and shouldnt be named that way.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200915120909.20838-2-kraxel@redhat.com
| -rw-r--r-- | hw/i386/microvm.c | 4 | ||||
| -rw-r--r-- | pc-bios/meson.build | 2 | ||||
| -rw-r--r-- | pc-bios/qboot.rom (renamed from pc-bios/bios-microvm.bin) | bin | 65536 -> 65536 bytes | |||
| -rw-r--r-- | roms/Makefile | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 81d0888930..b1dc7e49c1 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -47,7 +47,7 @@ #include "kvm_i386.h" #include "hw/xen/start_info.h" -#define MICROVM_BIOS_FILENAME "bios-microvm.bin" +#define MICROVM_QBOOT_FILENAME "qboot.rom" static void microvm_set_rtc(MicrovmMachineState *mms, ISADevice *s) { @@ -158,7 +158,7 @@ static void microvm_devices_init(MicrovmMachineState *mms) } if (bios_name == NULL) { - bios_name = MICROVM_BIOS_FILENAME; + bios_name = MICROVM_QBOOT_FILENAME; } x86_bios_rom_init(get_system_memory(), true); } diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 182d5ebb35..9759dba097 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -27,7 +27,7 @@ endif blobs = files( 'bios.bin', 'bios-256k.bin', - 'bios-microvm.bin', + 'qboot.rom', 'sgabios.bin', 'vgabios.bin', 'vgabios-cirrus.bin', diff --git a/pc-bios/bios-microvm.bin b/pc-bios/qboot.rom Binary files differindex 45eabc5166..45eabc5166 100644 --- a/pc-bios/bios-microvm.bin +++ b/pc-bios/qboot.rom diff --git a/roms/Makefile b/roms/Makefile index 3726f06fe7..1395a46695 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -68,7 +68,7 @@ default help: @echo " efi -- update UEFI (edk2) platform firmware" @echo " opensbi32-generic -- update OpenSBI for 32-bit generic machine" @echo " opensbi64-generic -- update OpenSBI for 64-bit generic machine" - @echo " bios-microvm -- update bios-microvm.bin (qboot)" + @echo " qboot -- update qboot" @echo " clean -- delete the files generated by the previous" \ "build targets" @@ -183,9 +183,9 @@ opensbi64-generic: cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv64-generic-fw_dynamic.bin cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf -bios-microvm: +qboot: $(MAKE) -C qboot - cp qboot/bios.bin ../pc-bios/bios-microvm.bin + cp qboot/bios.bin ../pc-bios/qboot.rom npcm7xx_bootrom: $(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix) |