ipxe: update to upstream version

Updated ipxe to current tree, which is
540e5960dc6b49eacf367f7c319fd0546474b845:

Provide PXENV_FILE_EXIT_HOOK only for ipxelinux.0 builds

Removed all the backported patches and updated
boot_prompt_option.patch to apply against current ipxe.

Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu>
Committed-by: Ian Jackson <ian.jackson.citrix.com>

5 files changed, 11 insertions, 167 deletions

diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index 326f9b8264..d23a54b34d 100644
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -10,7 +10,7 @@ else
 IPXE_GIT_URL := git://git.ipxe.org/ipxe.git
 endif
 
-IPXE_GIT_TAG := v1.0.0
+IPXE_GIT_TAG := 9a93db3f0947484e30e753bbd61a10b17336e20e
 
 IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
 
diff --git a/tools/firmware/etherboot/patches/boot_prompt_option.patch b/tools/firmware/etherboot/patches/boot_prompt_option.patch
index e5e8eed942..25d72c5fd5 100644
--- a/tools/firmware/etherboot/patches/boot_prompt_option.patch
+++ b/tools/firmware/etherboot/patches/boot_prompt_option.patch
@@ -1,7 +1,8 @@
-diff -pruN gpxe/src/arch/i386/prefix/romprefix.S gpxe.new/src/arch/i386/prefix/romprefix.S
---- gpxe/src/arch/i386/prefix/romprefix.S	2010-06-29 20:31:33.000000000 +0100
-+++ gpxe.new/src/arch/i386/prefix/romprefix.S	2010-07-20 10:40:20.000000000 +0100
-@@ -458,6 +458,7 @@ no_pmm:
+diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S
+index 0f92415..cce7505 100644
+--- a/src/arch/i386/prefix/romprefix.S
++++ b/src/arch/i386/prefix/romprefix.S
+@@ -391,6 +391,7 @@ no_pmm:
  	xorw	%di, %di
  	cs rep	movsb
  
@@ -9,15 +10,15 @@ diff -pruN gpxe/src/arch/i386/prefix/romprefix.S gpxe.new/src/arch/i386/prefix/r
  	/* Prompt for POST-time shell */
  	movw	$init_message_prompt, %si
  	xorw	%di, %di
-@@ -484,6 +485,7 @@ no_pmm:
+@@ -418,6 +419,7 @@ no_pmm:
  	pushw	%cs
  	call	exec
- out:
+ 2:
 +#endif
  	/* Restore registers */
  	popw	%gs
  	popw	%fs
-@@ -538,6 +540,7 @@ init_message_no_pmm:
+@@ -546,6 +548,7 @@ init_message_pmm:
  init_message_int19:
  	.asciz	" INT19"
  	.size	init_message_int19, . - init_message_int19
@@ -25,11 +26,11 @@ diff -pruN gpxe/src/arch/i386/prefix/romprefix.S gpxe.new/src/arch/i386/prefix/r
  init_message_prompt:
  	.asciz	"\nPress Ctrl-B to configure "
  	.size	init_message_prompt, . - init_message_prompt
-@@ -547,6 +550,7 @@ init_message_dots:
+@@ -555,6 +558,7 @@ init_message_dots:
  init_message_done:
  	.asciz	"\n\n"
  	.size	init_message_done, . - init_message_done
 +#endif
  
- /* ROM image location
+ /* PCI bus:dev.fn
   *
diff --git a/tools/firmware/etherboot/patches/gpxe-git-0edf2405b457 b/tools/firmware/etherboot/patches/gpxe-git-0edf2405b457
deleted file mode 100644
index ac36a631e6..0000000000
--- a/tools/firmware/etherboot/patches/gpxe-git-0edf2405b457
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 0edf2405b457e542c244a72285511b3ff5c06885
-Author: Michael Brown <mcb30@ipxe.org>
-Date:   Tue Apr 27 09:52:22 2010 +0100
-
-    [build] Fix building with binutils 2.16
-    
-    Signed-off-by: Michael Brown <mcb30@ipxe.org>
-    Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
-
-diff --git a/src/arch/i386/scripts/i386.lds b/src/arch/i386/scripts/i386.lds
-index 278a397..0ce2c10 100644
---- a/src/arch/i386/scripts/i386.lds
-+++ b/src/arch/i386/scripts/i386.lds
-@@ -24,6 +24,8 @@ SECTIONS {
-      *
-      */
- 
-+    PROVIDE ( _max_align = 16 );
-+
-     /*
-      * The prefix
-      *
-@@ -169,7 +171,6 @@ SECTIONS {
-      *
-      */
- 
--    PROVIDE ( _max_align = 16 );
-     .			= 0;
- 
-     .			= ALIGN ( _max_align );
diff --git a/tools/firmware/etherboot/patches/gpxe-git-a803ef3dfeac b/tools/firmware/etherboot/patches/gpxe-git-a803ef3dfeac
deleted file mode 100644
index ceab520d02..0000000000
--- a/tools/firmware/etherboot/patches/gpxe-git-a803ef3dfeac
+++ /dev/null
@@ -1,125 +0,0 @@
-commit a803ef3dfeac4e8aa35810bba65f9ccab0bdf264
-Author: Michael Brown <mcb30@ipxe.org>
-Date:   Thu Jun 24 01:23:00 2010 +0100
-
-    [build] Avoid hard-coding the path to perl
-    
-    The path "/usr/bin/perl" has been hard-coded since Etherboot 5.1, for
-    no discernible reason.  Use just "perl" instead to fix the
-    inconsistency and allow building on systems with Perl installed
-    outside of /usr/bin.
-    
-    This commit also includes a later fix that removes a dependency on
-    "perl" which broke builds from fully clean trees.
-    
-    Reported-by: Gabor Z. Papp <gzp@papp.hu>
-    Signed-off-by: Michael Brown <mcb30@ipxe.org>
-    Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
-
-diff -pruN a/src/arch/i386/Makefile.pcbios b/src/arch/i386/Makefile.pcbios
---- a/src/arch/i386/Makefile.pcbios	2010-06-29 20:31:33.000000000 +0100
-+++ b/src/arch/i386/Makefile.pcbios	2010-07-20 16:07:06.000000000 +0100
-@@ -24,11 +24,11 @@ MEDIA		+= raw
- 
- # Padding rules
- #
--PAD_rom		= $(PADIMG) --blksize=512 --byte=0xff $@
-+PAD_rom		= $(PERL) $(PADIMG) --blksize=512 --byte=0xff $@
- PAD_hrom	= $(PAD_rom)
- PAD_xrom	= $(PAD_rom)
--PAD_dsk		= $(PADIMG) --blksize=512 $@
--PAD_hd		= $(PADIMG) --blksize=32768 $@
-+PAD_dsk		= $(PERL) $(PADIMG) --blksize=512 $@
-+PAD_hd		= $(PERL) $(PADIMG) --blksize=32768 $@
- 
- # rule to make a non-emulation ISO boot image
- NON_AUTO_MEDIA	+= iso
-@@ -67,4 +67,4 @@ NON_AUTO_MEDIA	+= usb
- NON_AUTO_MEDIA += pdsk
- %pdsk : %dsk
- 	$(Q)cp $< $@
--	$(Q)$(PADIMG) --blksize=1474560 $@
-+	$(Q)$(PERL) $(PADIMG) --blksize=1474560 $@
-diff -pruN a/src/Makefile b/src/Makefile
---- a/src/Makefile	2010-06-29 20:31:33.000000000 +0100
-+++ b/src/Makefile	2010-07-20 16:02:56.000000000 +0100
-@@ -20,7 +20,7 @@ MKDIR		:= mkdir
- CP		:= cp
- ECHO		:= echo
- PRINTF		:= printf
--PERL		:= /usr/bin/perl
-+PERL		:= perl
- CC		:= $(CROSS_COMPILE)gcc
- CPP		:= $(CC) -E
- AS		:= $(CROSS_COMPILE)as
-@@ -31,12 +31,12 @@ RANLIB		:= $(CROSS_COMPILE)ranlib
- OBJCOPY		:= $(CROSS_COMPILE)objcopy
- NM		:= $(CROSS_COMPILE)nm
- OBJDUMP		:= $(CROSS_COMPILE)objdump
--PARSEROM	:= $(PERL) ./util/parserom.pl
--MAKEROM		:= $(PERL) ./util/makerom.pl
--SYMCHECK	:= $(PERL) ./util/symcheck.pl
--SORTOBJDUMP	:= $(PERL) ./util/sortobjdump.pl
--PADIMG		:= $(PERL) ./util/padimg.pl
--LICENCE		:= $(PERL) ./util/licence.pl
-+PARSEROM	:= ./util/parserom.pl
-+MAKEROM		:= ./util/makerom.pl
-+SYMCHECK	:= ./util/symcheck.pl
-+SORTOBJDUMP	:= ./util/sortobjdump.pl
-+PADIMG		:= ./util/padimg.pl
-+LICENCE		:= ./util/licence.pl
- NRV2B		:= ./util/nrv2b
- ZBIN		:= ./util/zbin
- ELF2EFI32	:= ./util/elf2efi32
-diff -pruN a/src/Makefile.housekeeping b/src/Makefile.housekeeping
---- a/src/Makefile.housekeeping	2010-06-29 20:31:33.000000000 +0100
-+++ b/src/Makefile.housekeeping	2010-07-20 16:04:42.000000000 +0100
-@@ -486,7 +486,7 @@ define src_template
- 		 '\n$(2) : $$($(4)_DEPS)\n' \
- 		 '\nTAGS : $$($(4)_DEPS)\n' \
- 		>> $(2)
--	@$(PARSEROM) $(1) >> $(2)
-+	@$(PERL) $(PARSEROM) $(1) >> $(2)
- 
- endef
- 
-@@ -695,7 +695,7 @@ $(BIN)/%.tmp : $(BLIB) $(MAKEDEPS) $(LDS
- 	$(QM)$(ECHO) "  [LD] $@"
- 	$(Q)$(LD) $(LDFLAGS) -T $(LDSCRIPT) $(TGT_LD_FLAGS) $(BLIB) -o $@ \
- 		-Map $(BIN)/$*.tmp.map
--	$(Q)$(OBJDUMP) -ht $@ | $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
-+	$(Q)$(OBJDUMP) -ht $@ | $(PERL) $(SORTOBJDUMP) >> $(BIN)/$*.tmp.map
- 
- # Keep intermediate object file (useful for debugging)
- .PRECIOUS : $(BIN)/%.tmp
-@@ -752,7 +752,7 @@ $(BIN)/%.licence : $(BIN)/%.tmp
- 		echo "files are missing a licence declaration:" ;\
- 		echo $(call unlicensed_deps_list,$<);\
- 		exit 1,\
--		$(LICENCE) $(call licence_list,$<))
-+		$(PERL) $(LICENCE) $(call licence_list,$<))
- 
- # Extract compression information from intermediate object file
- #
-@@ -866,10 +866,10 @@ endif # defined(BIN)
- # the automatic build system and varies by target; it includes the
- # "-p 0x1234,0x5678" string to set the PCI IDs.
- #
--FINALISE_rom	= $(MAKEROM) $(MAKEROM_FLAGS) $(TGT_MAKEROM_FLAGS) \
-+FINALISE_rom	= $(PERL) $(MAKEROM) $(MAKEROM_FLAGS) $(TGT_MAKEROM_FLAGS) \
- 		  -i$(IDENT) -s 0 $@
- FINALISE_hrom	= $(FINALISE_rom)
--FINALISE_xrom	= $(MAKEROM) $(MAKEROM_FLAGS) $(TGT_MAKEROM_FLAGS) \
-+FINALISE_xrom	= $(PERL) $(MAKEROM) $(MAKEROM_FLAGS) $(TGT_MAKEROM_FLAGS) \
- 		  -i$(IDENT) -n -s 0 $@
- 
- # Some ROMs require specific flags to be passed to makerom.pl
-@@ -987,7 +987,7 @@ $(SYMTAB) : $(BLIB)
- CLEANUP	+= $(BIN)/symtab
- 
- symcheck : $(SYMTAB)
--	$(SYMCHECK) $<
-+	$(PERL) $(SYMCHECK) $<
- 
- endif # defined(BIN)
- 
diff --git a/tools/firmware/etherboot/patches/series b/tools/firmware/etherboot/patches/series
index 836260729b..86cb300865 100644
--- a/tools/firmware/etherboot/patches/series
+++ b/tools/firmware/etherboot/patches/series
@@ -1,3 +1 @@
 boot_prompt_option.patch
-gpxe-git-0edf2405b457
-gpxe-git-a803ef3dfeac