Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-11-14' into staging

[qemu.git] / roms / Makefile

diff --git a/roms/Makefile b/roms/Makefile
index 7b3f156321c55e43c1f5b48e3a0b1fd4bb701f57..b5e5a69e910052681230e752ff89e422f356decd 100644 (file)
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -1,11 +1,13 @@
 
 vgabios_variants := stdvga cirrus vmware qxl isavga virtio
 vgabios_targets  := $(subst -isavga,,$(patsubst %,vgabios-%.bin,$(vgabios_variants)))
-pxerom_variants  := e1000 eepro100 ne2k_pci pcnet rtl8139 virtio
-pxerom_targets   := 8086100e 80861209 10500940 10222000 10ec8139 1af41000
+pxerom_variants  := e1000 e1000e eepro100 ne2k_pci pcnet rtl8139 virtio vmxnet3
+pxerom_targets   := 8086100e 808610d3 80861209 10500940 10222000 10ec8139 1af41000 15ad07b0
 
 pxe-rom-e1000    efi-rom-e1000    : VID := 8086
 pxe-rom-e1000    efi-rom-e1000    : DID := 100e
+pxe-rom-e1000e   efi-rom-e1000e   : VID := 8086
+pxe-rom-e1000e   efi-rom-e1000e   : DID := 10d3
 pxe-rom-eepro100 efi-rom-eepro100 : VID := 8086
 pxe-rom-eepro100 efi-rom-eepro100 : DID := 1209
 pxe-rom-ne2k_pci efi-rom-ne2k_pci : VID := 1050
@@ -16,6 +18,8 @@ pxe-rom-rtl8139  efi-rom-rtl8139  : VID := 10ec
 pxe-rom-rtl8139  efi-rom-rtl8139  : DID := 8139
 pxe-rom-virtio   efi-rom-virtio   : VID := 1af4
 pxe-rom-virtio   efi-rom-virtio   : DID := 1000
+pxe-rom-vmxnet3  efi-rom-vmxnet3  : VID := 15ad
+pxe-rom-vmxnet3  efi-rom-vmxnet3  : DID := 07b0
 
 #
 # cross compiler auto detection
@@ -35,7 +39,7 @@ powerpc_cross_prefix := $(call find-cross-prefix,powerpc)
 x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
 
 # tag our seabios builds
-SEABIOS_VERSION="$(shell cd seabios; git describe --tags --long) by qemu-project.org"
+SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org"
 
 #
 # EfiRom utility is shipped with edk2 / tianocore, in BaseTools/
@@ -59,12 +63,12 @@ default:
        @echo "  efirom         -- update nic roms (bios+efi, this needs"
        @echo "                    the EfiRom utility from edk2 / tianocore)"
        @echo "  slof           -- update slof.bin"
+       @echo "  skiboot        -- update skiboot.lid"
        @echo "  u-boot.e500    -- update u-boot.e500"
 
 bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
        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-256k/src/fw/*dsdt.aml ../pc-bios/
 
 seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants))
 
@@ -78,12 +82,12 @@ build-seabios-config-%: config.%
        mkdir -p seabios/builds/$*
        cp $< seabios/builds/$*/.config
        $(MAKE) -C seabios \
-               VERSION=$(SEABIOS_VERSION) \
+               EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \
                CROSS_COMPILE=$(x86_64_cross_prefix) \
                KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
                OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig
        $(MAKE) -C seabios \
-               VERSION=$(SEABIOS_VERSION) \
+               EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \
                CROSS_COMPILE=$(x86_64_cross_prefix) \
                KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
                OUT=$(CURDIR)/seabios/builds/$*/ all
@@ -100,7 +104,7 @@ build-lgplvgabios:
        $(MAKE) -C vgabios $(vgabios_targets)
 
 
-.PHONY: sgabios
+.PHONY: sgabios skiboot
 sgabios:
        $(MAKE) -C sgabios
        cp sgabios/sgabios.bin ../pc-bios
@@ -120,20 +124,17 @@ efi-rom-%: build-pxe-roms build-efi-roms
                -ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \
                -o ../pc-bios/efi-$*.rom
 
-build-pxe-roms: ipxe/src/config/local/general.h
-       $(MAKE) -C ipxe/src GITVERSION="" \
+build-pxe-roms:
+       $(MAKE) -C ipxe/src CONFIG=qemu \
                CROSS_COMPILE=$(x86_64_cross_prefix) \
                $(patsubst %,bin/%.rom,$(pxerom_targets))
 
-build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h
-       $(MAKE) -C ipxe/src GITVERSION="" \
+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))
 
-ipxe/src/config/local/%: config.ipxe.%
-       cp $< $@
-
 
 slof:
        $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
@@ -146,6 +147,10 @@ u-boot.e500:
        $(powerpc_cross_prefix)strip u-boot/build.e500/u-boot -o \
                ../pc-bios/u-boot.e500
 
+skiboot:
+       $(MAKE) -C skiboot CROSS=$(powerpc64_cross_prefix)
+       cp skiboot/skiboot.lid ../pc-bios/skiboot.lid
+
 clean:
        rm -rf seabios/.config seabios/out seabios/builds
        $(MAKE) -C vgabios clean
@@ -155,3 +160,4 @@ clean:
        $(MAKE) -C ipxe/src veryclean
        $(MAKE) -C SLOF clean
        rm -rf u-boot/build.e500
+       $(MAKE) -C skiboot clean