qboot: update to latest upstream

This also brings in two patches that Debian had to include,
qboot_stop_using_inttypes.patch and qboot_no_jump_tables.diff.

Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20201120152408.164346-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom
index 45eabc516692e2d134bbb630d133c7c2dcc9a9b6..7634106a0766913077e88dfcb1021c1168dcad3c 100644 (file)
Binary files a/pc-bios/qboot.rom and b/pc-bios/qboot.rom differ

diff --git a/roms/Makefile b/roms/Makefile
index 7045e374d3392f3afb2992366d2d0c433b211553..5ffe3317acd233586e1a2f87bddd6c8f9c3e38df 100644 (file)
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -186,9 +186,13 @@ 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
 
+MESON = meson
+NINJA = ninja
 qboot:
-       $(MAKE) -C qboot
-       cp qboot/bios.bin ../pc-bios/qboot.rom
+       mkdir -p qboot/build
+       $(MESON) setup $(if $(wildcard qboot/build/meson-private),--wipe,) qboot qboot/build
+       $(NINJA) -C qboot/build
+       cp qboot/build/bios.bin ../pc-bios/qboot.rom
 
 npcm7xx_bootrom:
        $(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix)

diff --git a/roms/qboot b/roms/qboot
index cb1c49e0cfac99b9961d136ac0194da62c28cf64..a5300c4949b8d4de2d34bedfaed66793f48ec948 160000 (submodule)
--- a/roms/qboot
+++ b/roms/qboot
@@ -1 +1 @@
-Subproject commit cb1c49e0cfac99b9961d136ac0194da62c28cf64
+Subproject commit a5300c4949b8d4de2d34bedfaed66793f48ec948