diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-11-20 16:24:08 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-11-20 10:48:53 -0500 |
| commit | 5983021eb6cd0fb8dfbac5211892f5231758d60b (patch) | |
| tree | da34c8b2d1c40318ccee404d668f2613cc18dc50 | |
| parent | 6ca2aa5cfb65f5fa791e2400a6db4e34b6f9fa27 (diff) | |
| download | qemu-5983021eb6cd0fb8dfbac5211892f5231758d60b.zip | |
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>
| -rw-r--r-- | pc-bios/qboot.rom | bin | 65536 -> 65536 bytes | |||
| -rw-r--r-- | roms/Makefile | 8 | ||||
| m--------- | roms/qboot | 0 |
3 files changed, 6 insertions, 2 deletions
diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom Binary files differindex 45eabc5166..7634106a07 100644 --- a/pc-bios/qboot.rom +++ b/pc-bios/qboot.rom 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 -Subproject cb1c49e0cfac99b9961d136ac0194da62c28cf6 +Subproject a5300c4949b8d4de2d34bedfaed66793f48ec94 |