aboutsummaryrefslogtreecommitdiff
path: root/roms
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-02-07 16:42:13 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-02-07 16:42:13 +0000
commit4db0014521a6820415298e10978b53dee3440f56 (patch)
treece7ba27564300c1a569506932c75c568b49011ec /roms
parent91abb80b5f66e8387ae1a5ba85083e49b877938c (diff)
parent41419b0f11d125ad792660638eb452c767eddc28 (diff)
downloadqemu-arm-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>
Diffstat (limited to 'roms')
-rw-r--r--roms/Makefile22
m---------roms/seabios0
2 files changed, 11 insertions, 11 deletions
diff --git a/roms/Makefile b/roms/Makefile
index 1e04669af4..2721b02b13 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