Merge tag 'pull-loongarch-20230920' of https://gitlab.com/gaosong/qemu into staging

[mirror_qemu.git] / roms / Makefile

diff --git a/roms/Makefile b/roms/Makefile
index b967b53bb76ee8a94fc9b37e44602a9444360a96..6859685290bf972f45274bd0f471349094d57bca 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))
 
@@ -131,25 +126,6 @@ build-efi-roms: build-pxe-roms
                CROSS_COMPILE=$(x86_64_cross_prefix) \
                $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
 
-# Build scripts can pass compiler/linker flags to the EDK2
-# build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and
-# EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables.
-#
-# Example:
-#
-#  make -C roms \
-#    EDK2_BASETOOLS_OPTFLAGS='...' \
-#    EDK2_BASETOOLS_LDFLAGS='...' \
-#    efirom
-#
-edk2-basetools:
-       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)' \
-               EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)'
-
 slof:
        $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
        cp SLOF/boot_rom.bin ../pc-bios/slof.bin
@@ -170,22 +146,24 @@ skiboot:
        $(MAKE) -C skiboot CROSS=$(powerpc64_cross_prefix)
        cp skiboot/skiboot.lid ../pc-bios/skiboot.lid
 
-efi: edk2-basetools
-       $(MAKE) -f Makefile.edk2
+efi:
+       python3 edk2-build.py --config edk2-build.config \
+               --version-override "edk2-stable202302-for-qemu" \
+               --release-date "03/01/2023"
+       rm -f ../pc-bios/edk2-*.fd.bz2
+       bzip2 --verbose ../pc-bios/edk2-*.fd
 
 opensbi32-generic:
        $(MAKE) -C opensbi \
                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
@@ -201,15 +179,13 @@ 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
        $(MAKE) -C u-boot-sam460ex distclean
        $(MAKE) -C skiboot clean
-       $(MAKE) -f Makefile.edk2 clean
+       rm -rf Build
        $(MAKE) -C opensbi clean
        $(MAKE) -C qboot clean
        $(MAKE) -C vbootrom clean