OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

microvm: name qboot binary qboot.rom

Browse Source 
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
This commit is contained in:
Gerd Hoffmann 2020-09-15 14:08:49 +02:00
parent 8ee612722d
commit 3bee1d1d14
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/microvm.c
View File

@ -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);
}

2
pc-bios/meson.build
View File

@ -27,7 +27,7 @@ endif
blobs = files(
'bios.bin',
'bios-256k.bin',
'bios-microvm.bin',
'qboot.rom',
'sgabios.bin',
'vgabios.bin',
'vgabios-cirrus.bin',

0
pc-bios/bios-microvm.bin → pc-bios/qboot.rom
View File

6
roms/Makefile
View File

@ -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)