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 <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
dreddy · Nov 20, 2020 · 5983021 · 5983021
1 parent 6ca2aa5
commit 5983021
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom
diff --git 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