summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pc-bios/qboot.rombin65536 -> 65536 bytes
-rw-r--r--roms/Makefile8
m---------roms/qboot0
3 files changed, 6 insertions, 2 deletions
diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom
index 45eabc5166..7634106a07 100644
--- a/pc-bios/qboot.rom
+++ b/pc-bios/qboot.rom
Binary files 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
-Subproject cb1c49e0cfac99b9961d136ac0194da62c28cf6
+Subproject a5300c4949b8d4de2d34bedfaed66793f48ec94