qapi/expr.py: enable pylint checks

[qemu.git] / roms / Makefile

diff --git a/roms/Makefile b/roms/Makefile
index f9acf39954dcf96618fab21cafe76fcbb487964f..5ffe3317acd233586e1a2f87bddd6c8f9c3e38df 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)
@@ -63,18 +64,20 @@ default help:
        @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-virt     -- update OpenSBI for 32-bit virt machine"
-       @echo "  opensbi64-virt     -- update OpenSBI for 64-bit virt machine"
-       @echo "  opensbi32-sifive_u -- update OpenSBI for 32-bit sifive_u machine"
-       @echo "  opensbi64-sifive_u -- update OpenSBI for 64-bit sifive_u machine"
-       @echo "  bios-microvm       -- update bios-microvm.bin (qboot)"
+       @echo "  opensbi32-generic  -- update OpenSBI for 32-bit generic machine"
+       @echo "  opensbi64-generic  -- update OpenSBI for 64-bit generic machine"
+       @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))
 
@@ -99,7 +102,7 @@ build-seabios-config-%: config.%
                OUT=$(CURDIR)/seabios/builds/$*/ all
 
 
-.PHONY: sgabios skiboot
+.PHONY: sgabios skiboot qboot
 sgabios:
        $(MAKE) -C sgabios
        cp sgabios/sgabios.bin ../pc-bios
@@ -115,7 +118,6 @@ efirom: $(patsubst %,efi-rom-%,$(pxerom_variants))
 efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools
        $(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \
                -b ipxe/src/bin/$(VID)$(DID).rom \
-               -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \
                -ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \
                -o ../pc-bios/efi-$*.rom
 
@@ -127,7 +129,6 @@ build-pxe-roms:
 build-efi-roms: build-pxe-roms
        $(MAKE) -C ipxe/src CONFIG=qemu \
                CROSS_COMPILE=$(x86_64_cross_prefix) \
-               $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
                $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
 
 # Build scripts can pass compiler/linker flags to the EDK2
@@ -142,6 +143,7 @@ build-efi-roms: build-pxe-roms
 #    efirom
 #
 edk2-basetools:
+       cd edk2/BaseTools && git submodule update --init --force
        $(MAKE) -C edk2/BaseTools \
                PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \
                EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
@@ -170,33 +172,31 @@ skiboot:
 efi: edk2-basetools
        $(MAKE) -f Makefile.edk2
 
-opensbi32-virt:
+opensbi32-generic:
        $(MAKE) -C opensbi \
                CROSS_COMPILE=$(riscv32_cross_prefix) \
-               PLATFORM="qemu/virt"
-       cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv32-virt-fw_jump.bin
+               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-virt:
+opensbi64-generic:
        $(MAKE) -C opensbi \
                CROSS_COMPILE=$(riscv64_cross_prefix) \
-               PLATFORM="qemu/virt"
-       cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-virt-fw_jump.bin
-
-opensbi32-sifive_u:
-       $(MAKE) -C opensbi \
-               CROSS_COMPILE=$(riscv32_cross_prefix) \
-               PLATFORM="sifive/fu540"
-       cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
-
-opensbi64-sifive_u:
-       $(MAKE) -C opensbi \
-               CROSS_COMPILE=$(riscv64_cross_prefix) \
-               PLATFORM="sifive/fu540"
-       cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
-
-bios-microvm:
-       $(MAKE) -C qboot
-       cp qboot/bios.bin ../pc-bios/bios-microvm.bin
+               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:
+       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
@@ -211,3 +211,4 @@ clean:
        $(MAKE) -f Makefile.edk2 clean
        $(MAKE) -C opensbi clean
        $(MAKE) -C qboot clean
+       $(MAKE) -C vbootrom clean