qga: fix erroneous argument to strerror

[mirror_qemu.git] / roms / Makefile

diff --git a/roms/Makefile b/roms/Makefile
index 10d5a65d61fa6c4ed850d985b361bc3a293a3586..b5e5a69e910052681230e752ff89e422f356decd 100644 (file)
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -1,11 +1,13 @@
 
-vgabios_variants := stdvga cirrus vmware qxl isavga
+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
@@ -31,8 +35,12 @@ find-cross-gcc = $(firstword $(wildcard $(patsubst %ld,%gcc,$(call find-cross-ld
 find-cross-prefix = $(subst gcc,,$(notdir $(call find-cross-gcc,$(1))))
 
 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)
 
+# tag our seabios builds
+SEABIOS_EXTRAVERSION="-prebuilt.qemu-project.org"
+
 #
 # EfiRom utility is shipped with edk2 / tianocore, in BaseTools/
 #
@@ -55,10 +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
-       cp seabios/builds/seabios/bios.bin ../pc-bios/bios.bin
-       cp seabios/builds/seabios/*dsdt.aml ../pc-bios/
+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
 
 seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants))
 
@@ -71,10 +81,14 @@ seavgabios-%: build-seabios-config-vga-%
 build-seabios-config-%: config.%
        mkdir -p seabios/builds/$*
        cp $< seabios/builds/$*/.config
-       $(MAKE) $(MAKEFLAGS) -C seabios \
+       $(MAKE) -C seabios \
+               EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \
+               CROSS_COMPILE=$(x86_64_cross_prefix) \
                KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
                OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig
-       $(MAKE) $(MAKEFLAGS) -C seabios \
+       $(MAKE) -C seabios \
+               EXTRAVERSION=$(SEABIOS_EXTRAVERSION) \
+               CROSS_COMPILE=$(x86_64_cross_prefix) \
                KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
                OUT=$(CURDIR)/seabios/builds/$*/ all
 
@@ -87,12 +101,12 @@ lgplvgabios-%: build-lgplvgabios
        cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin
 
 build-lgplvgabios:
-       $(MAKE) $(MAKEFLAGS) -C vgabios $(vgabios_targets)
+       $(MAKE) -C vgabios $(vgabios_targets)
 
 
-.PHONY: sgabios
+.PHONY: sgabios skiboot
 sgabios:
-       $(MAKE) $(MAKEFLAGS) -C sgabios
+       $(MAKE) -C sgabios
        cp sgabios/sgabios.bin ../pc-bios
 
 
@@ -110,31 +124,40 @@ 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) $(MAKEFLAGS) -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) $(MAKEFLAGS) -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) $(MAKEFLAGS) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
+       $(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 CROSS_COMPILE=$(powerpc_cross_prefix) \
+               O=build.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) $(MAKEFLAGS) -C vgabios clean
+       $(MAKE) -C vgabios clean
        rm -f vgabios/VGABIOS-lgpl-latest*
-       $(MAKE) $(MAKEFLAGS) -C sgabios clean
+       $(MAKE) -C sgabios clean
        rm -f sgabios/.depend
-       $(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean
-       $(MAKE) $(MAKEFLAGS) -C SLOF clean
+       $(MAKE) -C ipxe/src veryclean
+       $(MAKE) -C SLOF clean
+       rm -rf u-boot/build.e500
+       $(MAKE) -C skiboot clean