From: Paolo Bonzini Date: Fri, 20 Nov 2020 15:24:08 +0000 (+0100) Subject: qboot: update to latest upstream X-Git-Tag: qemu-xen-4.16.0-rc4~467^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5983021eb6cd0fb8dfbac5211892f5231758d60b;p=qemu-xen.git 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 Signed-off-by: Paolo Bonzini Message-Id: <20201120152408.164346-1-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom index 45eabc5166..7634106a07 100644 Binary files a/pc-bios/qboot.rom and b/pc-bios/qboot.rom differ diff --git a/roms/Makefile b/roms/Makefile index 7045e374d3..5ffe3317ac 100644 --- 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 cb1c49e0cf..a5300c4949 160000 --- a/roms/qboot +++ b/roms/qboot @@ -1 +1 @@ -Subproject commit cb1c49e0cfac99b9961d136ac0194da62c28cf64 +Subproject commit a5300c4949b8d4de2d34bedfaed66793f48ec948