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 eeb5970348cd6d28fa4165d25562734a4f9ba74a..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)' \
@@ -177,14 +178,12 @@ 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