ipxe: update to 35c53797 to 4e03af8, build tweaks.

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJV6EJxAAoJEEy22O7T6HE4KjwQAJwPviOYkS7t/L7jwv6RZJyr
 zvQYiMa18qYHvLhdRYTv/3FcNUI8Nthqf8lUDSuuwWEIStDVNa2+zjNEZcomp8CI
 8dTsCRc4AHFqMCe6Vj7UnJwb+WHUy/d8NhrOOqHntZ7019AwzbchxxTxeISV7paV
 a8OrJoz5Ta2h5jCAglEypGTmMTC2F8Mci0I/0Odt9KOZFbRRWb/U+38BS70/Imxf
 junys7Yp0bqxkXO94US5NYRj2VzNWryEBcNqReOKejACH2yK/ZzsunOFAzkSdyeg
 I2U2eI4a84t7dQdAETElLVz8faJxQ1SA7VXakA6WWIcH7YNVgtgfN/j2o4MYp2VI
 g9YNIcjOljK2U7QWmv64N8JEf8IDFDRkmnXX0Dm9UJDtWIT2ASvksYncX7ZsPy3Q
 P0e/ztpnuLipHv8HMFeWov6lktQt2CRIotW6X2mqAzQNs85TJEQK0aHyeAsn79IT
 hW3uY+DCK3GPp2rseJUKaN5Zb/az7bg4mEjbKr4veIm2QceUbA3MMtVfE6ODqUfx
 I2VENKNoQ+Ep+dwxTqRKFmKixtEczM61TLIPvnEHSKUTF0VJeoqAn9VI6jTj5XR3
 DtHx4cTxkwBK5b8pvmNz1jVj9VeLws+9JmhMTRTUJjYrhAbTI2v4VTOIqvbfVLY/
 qukfBGL8HufEQ6rkQ7so
 =coER
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20150903-1' into staging

ipxe: update to 35c53797 to 4e03af8, build tweaks.

# gpg: Signature made Thu 03 Sep 2015 13:52:01 BST 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-ipxe-20150903-1:
  ipxe: update binaries
  ipxe: use upstream configuration
  ipxe: don't override GITVERSION
  ipxe: update from 35c53797 to 4e03af8

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

roms/Makefile

@@ -120,20 +120,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

roms/config.ipxe.general.h

@@ -1,4 +0,0 @@
-#undef BANNER_TIMEOUT
-#define BANNER_TIMEOUT 30
-#undef ROM_BANNER_TIMEOUT
-#define ROM_BANNER_TIMEOUT 0

roms/ipxe

@@ -1 +1 @@
-Subproject commit 35c5379760aa1fea5e38f7a78b090f92bb7813ee
+Subproject commit 4e03af8ec2d497e725566a91fd5c19dd604c18a6