roms: add microvm-bios (qboot) as binary and git submodule

qboot is a minimalist x86 firmware for booting Linux kernels. It does
the mininum amount of work required for the task, and it's able to
boot both PVH images and bzImages without relying on option roms.

This characteristics make it an ideal companion for the microvm
machine type.

Signed-off-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/.gitmodules b/.gitmodules
index c5c474169dc7191ce55f5a1b00b81fcea6c3973b..19792c9a11a09b72b088c9fbd87e523941a889da 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,6 @@
 [submodule "roms/opensbi"]
        path = roms/opensbi
        url =   https://git.qemu.org/git/opensbi.git
+[submodule "roms/qboot"]
+       path = roms/qboot
+       url = https://github.com/bonzini/qboot

diff --git a/pc-bios/bios-microvm.bin b/pc-bios/bios-microvm.bin
new file mode 100644 (file)
index 0000000..45eabc5
Binary files /dev/null and b/pc-bios/bios-microvm.bin differ

diff --git a/roms/Makefile b/roms/Makefile
index da4efa47a9282ee0c044a8c4db9520a125143ddd..c15017051938b0cd8327678c472757abd5232628 100644 (file)
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -67,6 +67,7 @@ default help:
        @echo "  opensbi32-virt     -- update OpenSBI for 32-bit virt machine"
        @echo "  opensbi64-virt     -- update OpenSBI for 64-bit virt machine"
        @echo "  opensbi64-sifive_u -- update OpenSBI for 64-bit sifive_u machine"
+       @echo "  bios-microvm       -- update bios-microvm.bin (qboot)"
        @echo "  clean              -- delete the files generated by the previous" \
                                      "build targets"
 
@@ -186,6 +187,10 @@ opensbi64-sifive_u:
                PLATFORM="sifive/fu540"
        cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
 
+bios-microvm:
+       $(MAKE) -C qboot
+       cp qboot/bios.bin ../pc-bios/bios-microvm.bin
+
 clean:
        rm -rf seabios/.config seabios/out seabios/builds
        $(MAKE) -C sgabios clean
@@ -198,3 +203,4 @@ clean:
        $(MAKE) -C skiboot clean
        $(MAKE) -f Makefile.edk2 clean
        $(MAKE) -C opensbi clean
+       $(MAKE) -C qboot clean

diff --git a/roms/qboot b/roms/qboot
new file mode 160000 (submodule)
index 0000000..cb1c49e
--- /dev/null
+++ b/roms/qboot
@@ -0,0 +1 @@
+Subproject commit cb1c49e0cfac99b9961d136ac0194da62c28cf64