roms/opensbi: Upgrade from v1.1 to v1.2

[mirror_qemu.git] / roms / Makefile

diff --git a/roms/Makefile b/roms/Makefile
index 5ffe3317acd233586e1a2f87bddd6c8f9c3e38df..955f92286de0604d74c7a91096986ce64222e4a8 100644 (file)
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -57,7 +57,6 @@ default help:
        @echo "available build targets:"
        @echo "  bios               -- update bios.bin (seabios)"
        @echo "  vgabios            -- update vgabios binaries (seabios)"
-       @echo "  sgabios            -- update sgabios binaries"
        @echo "  pxerom             -- update nic roms (bios only)"
        @echo "  efirom             -- update nic roms (bios+efi)"
        @echo "  slof               -- update slof.bin"
@@ -102,11 +101,7 @@ build-seabios-config-%: config.%
                OUT=$(CURDIR)/seabios/builds/$*/ all
 
 
-.PHONY: sgabios skiboot qboot
-sgabios:
-       $(MAKE) -C sgabios
-       cp sgabios/sgabios.bin ../pc-bios
-
+.PHONY: skiboot qboot
 
 pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants))
 
@@ -143,7 +138,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 +150,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,14 +173,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
@@ -200,12 +194,10 @@ npcm7xx_bootrom:
 
 clean:
        rm -rf seabios/.config seabios/out seabios/builds
-       $(MAKE) -C sgabios clean
-       rm -f sgabios/.depend
        $(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