Merge remote-tracking branch 'awilliam/ipxe' into staging

diff --combined Makefile
index dc39efdeb475e9328f8ac18b39e19897c8e89ba0,9df4fff630d89f7af2905ceec02b3b8c49a15313..67c02687efc083d768465145ec6075cdc09306fe
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -163,10 -163,7 +163,10 @@@ distclean: clea
        rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi
        rm -f config-all-devices.mak
        rm -f roms/seabios/config.mak roms/vgabios/config.mak
 -      rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.dvi qemu-doc.fn qemu-doc.info qemu-doc.ky qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp qemu-doc.vr
 +      rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi
 +      rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys
 +      rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp
 +      rm -f qemu-doc.vr
        rm -f qemu-tech.info qemu-tech.aux qemu-tech.cp qemu-tech.dvi qemu-tech.fn qemu-tech.info qemu-tech.ky qemu-tech.log qemu-tech.pdf qemu-tech.pg qemu-tech.toc qemu-tech.tp qemu-tech.vr
        for d in $(TARGET_DIRS) $(QEMULIBS); do \
        rm -rf $$d || exit 1 ; \
@@@ -180,10 -177,8 +180,8 @@@ ifdef INSTALL_BLOB
  BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \
  vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
  ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
- gpxe-eepro100-80861209.rom \
- pxe-e1000.bin \
- pxe-ne2k_pci.bin pxe-pcnet.bin \
- pxe-rtl8139.bin pxe-virtio.bin \
+ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
+ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
  bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
  multiboot.bin linuxboot.bin \
  s390-zipl.rom \
@@@ -329,10 -324,12 +327,12 @@@ tarbin
        $(datadir)/openbios-sparc32 \
        $(datadir)/openbios-sparc64 \
        $(datadir)/openbios-ppc \
-       $(datadir)/pxe-ne2k_pci.bin \
-       $(datadir)/pxe-rtl8139.bin \
-       $(datadir)/pxe-pcnet.bin \
-       $(datadir)/pxe-e1000.bin \
+       $(datadir)/pxe-e1000.rom \
+       $(datadir)/pxe-eepro100.rom \
+       $(datadir)/pxe-ne2k_pci.rom \
+       $(datadir)/pxe-pcnet.rom \
+       $(datadir)/pxe-rtl8139.rom \
+       $(datadir)/pxe-virtio.rom \
        $(docdir)/qemu-doc.html \
        $(docdir)/qemu-tech.html \
        $(mandir)/man1/qemu.1 \

diff --combined configure
index f2eab308b233d65ab6a130883ae4c943e764df6a,813ef7a7a2a046f939c18e186c61dfb9fa9173f8..de44bac1d6a00ada3870e89fb52172d8bf8928c0
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -177,7 -177,6 +177,7 @@@ spice="
  rbd=""
  smartcard=""
  smartcard_nss=""
 +opengl="no"
  
  # parse CC options first
  for opt do
@@@ -284,7 -283,7 +284,7 @@@ els
  fi
  
  case "$cpu" in
 -  alpha|cris|ia64|lm32|m68k|microblaze|ppc|ppc64|sparc64)
 +  alpha|cris|ia64|lm32|m68k|microblaze|ppc|ppc64|sparc64|unicore32)
      cpu="$cpu"
    ;;
    i386|i486|i586|i686|i86pc|BePC)
@@@ -815,9 -814,6 +815,9 @@@ case "$cpu" i
      hppa*)
             host_guest_base="yes"
             ;;
 +    unicore32*)
 +           host_guest_base="yes"
 +           ;;
  esac
  
  [ -z "$guest_base" ] && guest_base="$host_guest_base"
@@@ -1052,7 -1048,6 +1052,7 @@@ sh4eb-linux-user 
  sparc-linux-user \
  sparc64-linux-user \
  sparc32plus-linux-user \
 +unicore32-linux-user \
  "
      fi
  # the following are Darwin specific
@@@ -1238,7 -1233,7 +1238,7 @@@ els
    fi
    sdl=no
  fi
 -if test -n "$cross_prefix" && test "`basename $sdlconfig`" = sdl-config; then
 +if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl-config; then
    echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2
  fi
  
@@@ -2638,7 -2633,7 +2638,7 @@@ echo "docdir=$docdir" >> $config_host_m
  echo "confdir=$confdir" >> $config_host_mak
  
  case "$cpu" in
 -  i386|x86_64|alpha|cris|hppa|ia64|lm32|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64)
 +  i386|x86_64|alpha|cris|hppa|ia64|lm32|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64|unicore32)
      ARCH=$cpu
    ;;
    armv4b|armv4l)
@@@ -3189,10 -3184,6 +3189,10 @@@ case "$target_arch2" i
    s390x)
      target_nptl="yes"
      target_phys_bits=64
 +    target_long_alignment=8
 +  ;;
 +  unicore32)
 +    target_phys_bits=32
    ;;
    *)
      echo "Unsupported target CPU"
@@@ -3275,7 -3266,14 +3275,7 @@@ if test ! -z "$gdb_xml_files" ; the
    echo "TARGET_XML_FILES=$list" >> $config_target_mak
  fi
  
 -case "$target_arch2" in
 -  i386|x86_64)
 -    echo "CONFIG_NOSOFTFLOAT=y" >> $config_target_mak
 -    ;;
 -  *)
 -    echo "CONFIG_SOFTFLOAT=y" >> $config_target_mak
 -    ;;
 -esac
 +echo "CONFIG_SOFTFLOAT=y" >> $config_target_mak
  
  if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
    echo "TARGET_HAS_BFLT=y" >> $config_target_mak
@@@ -3447,7 -3445,7 +3447,7 @@@ FILES="Makefile tests/Makefile
  FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
  FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
  FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
- for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
+ for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.rom $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do
      FILES="$FILES pc-bios/`basename $bios_file`"
  done
  mkdir -p $DIRS