aboutsummaryrefslogtreecommitdiff
path: root/roms/Makefile
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-11-20 16:24:08 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2020-11-20 10:48:53 -0500
commit5983021eb6cd0fb8dfbac5211892f5231758d60b (patch)
treeda34c8b2d1c40318ccee404d668f2613cc18dc50 /roms/Makefile
parent6ca2aa5cfb65f5fa791e2400a6db4e34b6f9fa27 (diff)
downloadqemu-5983021eb6cd0fb8dfbac5211892f5231758d60b.zip
qemu-5983021eb6cd0fb8dfbac5211892f5231758d60b.tar.gz
qemu-5983021eb6cd0fb8dfbac5211892f5231758d60b.tar.bz2
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>
Diffstat (limited to 'roms/Makefile')
-rw-r--r--roms/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/roms/Makefile b/roms/Makefile
index 7045e37..5ffe331 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)