target/hppa: Update to SeaBIOS-hppa version 9

[mirror_qemu.git] / roms / Makefile

diff --git a/roms/Makefile b/roms/Makefile
index 8cafced348e593af1c9424573d1a98d7b2c56aa5..6859685290bf972f45274bd0f471349094d57bca 100644 (file)
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -34,6 +34,7 @@ find-cross-gcc = $(firstword $(wildcard $(patsubst %ld,%gcc,$(call find-cross-ld
 # finally strip off path + toolname so we get the prefix
 find-cross-prefix = $(subst gcc,,$(notdir $(call find-cross-gcc,$(1))))
 
+arm_cross_prefix := $(call find-cross-prefix,arm)
 powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64)
 powerpc_cross_prefix := $(call find-cross-prefix,powerpc)
 x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
@@ -56,23 +57,26 @@ 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"
        @echo "  skiboot            -- update skiboot.lid"
        @echo "  u-boot.e500        -- update u-boot.e500"
        @echo "  u-boot.sam460      -- update u-boot.sam460"
+       @echo "  npcm7xx_bootrom    -- update vbootrom for npcm7xx"
        @echo "  efi                -- update UEFI (edk2) platform firmware"
        @echo "  opensbi32-generic  -- update OpenSBI for 32-bit generic machine"
        @echo "  opensbi64-generic  -- update OpenSBI for 64-bit generic machine"
-       @echo "  bios-microvm       -- update bios-microvm.bin (qboot)"
+       @echo "  qboot              -- update qboot"
        @echo "  clean              -- delete the files generated by the previous" \
                                      "build targets"
 
-bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
+bios: build-seabios-config-seabios-128k \
+               build-seabios-config-seabios-256k \
+               build-seabios-config-seabios-microvm
        cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin
        cp seabios/builds/seabios-256k/bios.bin ../pc-bios/bios-256k.bin
+       cp seabios/builds/seabios-microvm/bios.bin ../pc-bios/bios-microvm.bin
 
 vgabios seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants))
 
@@ -97,11 +101,7 @@ build-seabios-config-%: config.%
                OUT=$(CURDIR)/seabios/builds/$*/ all
 
 
-.PHONY: sgabios skiboot
-sgabios:
-       $(MAKE) -C sgabios
-       cp sgabios/sgabios.bin ../pc-bios
-
+.PHONY: skiboot qboot
 
 pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants))
 
@@ -126,32 +126,15 @@ 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:
-       $(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
 
 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:
@@ -163,37 +146,46 @@ 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
 
-bios-microvm:
-       $(MAKE) -C qboot
-       cp qboot/bios.bin ../pc-bios/bios-microvm.bin
+MESON = meson
+NINJA = ninja
+qboot:
+       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)
+       cp vbootrom/npcm7xx_bootrom.bin ../pc-bios/npcm7xx_bootrom.bin
 
 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
+       rm -rf Build
        $(MAKE) -C opensbi clean
        $(MAKE) -C qboot clean
+       $(MAKE) -C vbootrom clean