diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-07 16:42:13 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-07 16:42:13 +0000 |
| commit | 4db0014521a6820415298e10978b53dee3440f56 (patch) | |
| tree | ce7ba27564300c1a569506932c75c568b49011ec | |
| parent | 91abb80b5f66e8387ae1a5ba85083e49b877938c (diff) | |
| parent | 41419b0f11d125ad792660638eb452c767eddc28 (diff) | |
| download | hqemu-4db0014521a6820415298e10978b53dee3440f56.zip hqemu-4db0014521a6820415298e10978b53dee3440f56.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-1' into staging
Update seabios to 1.7.4
# gpg: Signature made Mon 03 Feb 2014 14:42:44 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-roms-1:
Update seabios binaries to 1.7.4
Update seabios submodule to 1.7.4
roms: remove explicit MAKEFLAGS from recursive make invocations
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | pc-bios/bios-256k.bin | bin | 262144 -> 262144 bytes | |||
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 131072 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-cirrus.bin | bin | 36864 -> 36864 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-qxl.bin | bin | 37376 -> 37376 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-stdvga.bin | bin | 37376 -> 37376 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-vmware.bin | bin | 37376 -> 37376 bytes | |||
| -rw-r--r-- | pc-bios/vgabios.bin | bin | 36864 -> 36864 bytes | |||
| -rw-r--r-- | roms/Makefile | 22 | ||||
| m--------- | roms/seabios | 0 |
9 files changed, 11 insertions, 11 deletions
diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin Binary files differindex 68017e5..93202c5 100644 --- a/pc-bios/bios-256k.bin +++ b/pc-bios/bios-256k.bin diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex 4f4383b..d7899bd 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin Binary files differindex 36b197d..d8cb9d2 100644 --- a/pc-bios/vgabios-cirrus.bin +++ b/pc-bios/vgabios-cirrus.bin diff --git a/pc-bios/vgabios-qxl.bin b/pc-bios/vgabios-qxl.bin Binary files differindex aaa3b10..fe57401 100644 --- a/pc-bios/vgabios-qxl.bin +++ b/pc-bios/vgabios-qxl.bin diff --git a/pc-bios/vgabios-stdvga.bin b/pc-bios/vgabios-stdvga.bin Binary files differindex d329e24..2aa659c 100644 --- a/pc-bios/vgabios-stdvga.bin +++ b/pc-bios/vgabios-stdvga.bin diff --git a/pc-bios/vgabios-vmware.bin b/pc-bios/vgabios-vmware.bin Binary files differindex 31d56a9..bed7068 100644 --- a/pc-bios/vgabios-vmware.bin +++ b/pc-bios/vgabios-vmware.bin diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin Binary files differindex b87f74d..928095f 100644 --- a/pc-bios/vgabios.bin +++ b/pc-bios/vgabios.bin diff --git a/roms/Makefile b/roms/Makefile index 1e04669..2721b02 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -72,11 +72,11 @@ seavgabios-%: build-seabios-config-vga-% build-seabios-config-%: config.% mkdir -p seabios/builds/$* cp $< seabios/builds/$*/.config - $(MAKE) $(MAKEFLAGS) -C seabios \ + $(MAKE) -C seabios \ CROSS_COMPILE=$(x86_64_cross_prefix) \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig - $(MAKE) $(MAKEFLAGS) -C seabios \ + $(MAKE) -C seabios \ CROSS_COMPILE=$(x86_64_cross_prefix) \ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ OUT=$(CURDIR)/seabios/builds/$*/ all @@ -90,12 +90,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 sgabios: - $(MAKE) $(MAKEFLAGS) -C sgabios + $(MAKE) -C sgabios cp sgabios/sgabios.bin ../pc-bios @@ -114,12 +114,12 @@ efi-rom-%: build-pxe-roms build-efi-roms -o ../pc-bios/efi-$*.rom build-pxe-roms: ipxe/src/config/local/general.h - $(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \ + $(MAKE) -C ipxe/src GITVERSION="" \ 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="" \ + $(MAKE) -C ipxe/src GITVERSION="" \ CROSS_COMPILE=$(x86_64_cross_prefix) \ $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) @@ -129,15 +129,15 @@ ipxe/src/config/local/%: config.ipxe.% 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 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 diff --git a/roms/seabios b/roms/seabios -Subproject 31b8b4eea9d9ad58a73b22a6060d3ac1c419c26 +Subproject 96917a8ed761f017fc8c72ba3b9181fbac03ac5 |
