Merge tag 'pull-ppc-20220831' of https://gitlab.com/danielhb/qemu into staging

[mirror_qemu.git] / roms / Makefile

diff --git a/roms/Makefile b/roms/Makefile
index 7045e374d3392f3afb2992366d2d0c433b211553..5e44d9789001979a0e9ef3183f90beac528a6bf4 100644 (file)
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -143,7 +143,8 @@ build-efi-roms: build-pxe-roms
 #    efirom
 #
 edk2-basetools:
-       cd edk2/BaseTools && git submodule update --init --force
+       cd edk2/BaseTools && git submodule update --init --force \
+               Source/C/BrotliCompress/brotli
        $(MAKE) -C edk2/BaseTools \
                PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \
                EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
@@ -154,10 +155,10 @@ slof:
        cp SLOF/boot_rom.bin ../pc-bios/slof.bin
 
 u-boot.e500:
-       $(MAKE) -C u-boot O=build.e500 qemu-ppce500_config
+       $(MAKE) -C u-boot O=build-e500 qemu-ppce500_config
        $(MAKE) -C u-boot CROSS_COMPILE=$(powerpc_cross_prefix) \
-               O=build.e500
-       $(powerpc_cross_prefix)strip u-boot/build.e500/u-boot -o \
+               O=build-e500
+       $(powerpc_cross_prefix)strip u-boot/build-e500/u-boot -o \
                ../pc-bios/u-boot.e500
 
 u-boot.sam460:
@@ -177,18 +178,20 @@ opensbi32-generic:
                CROSS_COMPILE=$(riscv32_cross_prefix) \
                PLATFORM="generic"
        cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
-       cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
 
 opensbi64-generic:
        $(MAKE) -C opensbi \
                CROSS_COMPILE=$(riscv64_cross_prefix) \
                PLATFORM="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)
@@ -201,7 +204,7 @@ clean:
        $(MAKE) -C ipxe/src veryclean
        $(MAKE) -C edk2/BaseTools clean
        $(MAKE) -C SLOF clean
-       rm -rf u-boot/build.e500
+       rm -rf u-boot/build-e500
        $(MAKE) -C u-boot-sam460ex distclean
        $(MAKE) -C skiboot clean
        $(MAKE) -f Makefile.edk2 clean