diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-04-25 10:26:10 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-04-25 10:26:10 -0500 |
| commit | dbf352ad6e55dc7b40c62b402289164265a4f17c (patch) | |
| tree | 77a367c96da508ad4db2741940afd3fcbc6ca883 /Makefile | |
| parent | 347ac8e35661eff1c2b5ec74d11ee152f2a61856 (diff) | |
| parent | 36d8d02dc8c45780cae74e2ba7a6135b95c16f81 (diff) | |
| download | qemu-dbf352ad6e55dc7b40c62b402289164265a4f17c.zip qemu-dbf352ad6e55dc7b40c62b402289164265a4f17c.tar.gz qemu-dbf352ad6e55dc7b40c62b402289164265a4f17c.tar.bz2 | |
Merge remote-tracking branch 'awilliam/ipxe' into staging
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -180,10 +180,8 @@ ifdef INSTALL_BLOBS 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 +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 \ |