[build] Rename gPXE to iPXE

Access to the gpxe.org and etherboot.org domains and associated resources has been revoked by the registrant of the domain. Work around this problem by renaming project from gPXE to iPXE, and updating URLs to match. Also update README, LOG and COPYRIGHTS to remove obsolete information. Signed-off-by: Michael Brown <mcb30@ipxe.org>
2026-02-14 02:31:26 +03:00 · 2010-04-19 20:16:01 +01:00
parent 2a36703af2
commit 8406115834
597 changed files with 2220 additions and 2288 deletions
--- a/src/drivers/bitbash/bitbash.c
+++ b/src/drivers/bitbash/bitbash.c
@@ -18,7 +18,7 @@

 FILE_LICENCE ( GPL2_OR_LATER );

-#include <gpxe/bitbash.h>
+#include <ipxe/bitbash.h>

 /** @file
 *
--- a/src/drivers/bitbash/i2c_bit.c
+++ b/src/drivers/bitbash/i2c_bit.c
@@ -24,8 +24,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
-#include <gpxe/bitbash.h>
-#include <gpxe/i2c.h>
+#include <ipxe/bitbash.h>
+#include <ipxe/i2c.h>

 /** @file
 *
--- a/src/drivers/bitbash/spi_bit.c
+++ b/src/drivers/bitbash/spi_bit.c
@@ -25,8 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <unistd.h>
-#include <gpxe/bitbash.h>
-#include <gpxe/spi_bit.h>
+#include <ipxe/bitbash.h>
+#include <ipxe/spi_bit.h>

 /** @file
 *
--- a/src/drivers/block/ata.c
+++ b/src/drivers/block/ata.c
@@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/process.h>
-#include <gpxe/ata.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/process.h>
+#include <ipxe/ata.h>

 /** @file
 *
--- a/src/drivers/block/ramdisk.c
+++ b/src/drivers/block/ramdisk.c
@@ -18,8 +18,8 @@

 FILE_LICENCE ( GPL2_OR_LATER );

-#include <gpxe/blockdev.h>
-#include <gpxe/ramdisk.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/ramdisk.h>

 /**
 * @file
--- a/src/drivers/block/scsi.c
+++ b/src/drivers/block/scsi.c
@@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/process.h>
-#include <gpxe/scsi.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/process.h>
+#include <ipxe/scsi.h>

 /** @file
 *
--- a/src/drivers/block/srp.c
+++ b/src/drivers/block/srp.c
@@ -33,11 +33,11 @@ FILE_LICENCE ( BSD2 );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/scsi.h>
-#include <gpxe/xfer.h>
-#include <gpxe/features.h>
-#include <gpxe/ib_srp.h>
-#include <gpxe/srp.h>
+#include <ipxe/scsi.h>
+#include <ipxe/xfer.h>
+#include <ipxe/features.h>
+#include <ipxe/ib_srp.h>
+#include <ipxe/srp.h>

 /**
 * @file
--- a/src/drivers/bus/eisa.c
+++ b/src/drivers/bus/eisa.c
@@ -3,9 +3,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <unistd.h>
-#include <gpxe/eisa.h>
+#include <ipxe/eisa.h>

 FILE_LICENCE ( GPL2_OR_LATER );

--- a/src/drivers/bus/isa.c
+++ b/src/drivers/bus/isa.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/io.h>
-#include <gpxe/isa.h>
+#include <ipxe/io.h>
+#include <ipxe/isa.h>

 FILE_LICENCE ( GPL2_OR_LATER );

--- a/src/drivers/bus/isa_ids.c
+++ b/src/drivers/bus/isa_ids.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <byteswap.h>
-#include <gpxe/isa_ids.h>
+#include <ipxe/isa_ids.h>

 /* 
 * EISA and ISAPnP IDs are actually mildly human readable, though in a
--- a/src/drivers/bus/isapnp.c
+++ b/src/drivers/bus/isapnp.c
@@ -62,9 +62,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <unistd.h>
-#include <gpxe/isapnp.h>
+#include <ipxe/isapnp.h>

 /**
 * ISAPnP Read Port address.
--- a/src/drivers/bus/mca.c
+++ b/src/drivers/bus/mca.c
@@ -12,8 +12,8 @@ FILE_LICENCE ( BSD2 );
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/io.h>
-#include <gpxe/mca.h>
+#include <ipxe/io.h>
+#include <ipxe/mca.h>

 static void mcabus_remove ( struct root_device *rootdev );

--- a/src/drivers/bus/pci.c
+++ b/src/drivers/bus/pci.c
@@ -26,9 +26,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/tables.h>
-#include <gpxe/device.h>
-#include <gpxe/pci.h>
+#include <ipxe/tables.h>
+#include <ipxe/device.h>
+#include <ipxe/pci.h>

 /** @file
 *
--- a/src/drivers/bus/pcibackup.c
+++ b/src/drivers/bus/pcibackup.c
@@ -19,8 +19,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );

 #include <stdint.h>
-#include <gpxe/pci.h>
-#include <gpxe/pcibackup.h>
+#include <ipxe/pci.h>
+#include <ipxe/pcibackup.h>

 /** @file
 *
--- a/src/drivers/bus/pciextra.c
+++ b/src/drivers/bus/pciextra.c
@@ -1,7 +1,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );

 #include <stdint.h>
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>

 /**
 * Look for a PCI capability
--- a/src/drivers/bus/virtio-pci.c
+++ b/src/drivers/bus/virtio-pci.c
@@ -12,9 +12,9 @@
 */

 #include "etherboot.h"
-#include "gpxe/io.h"
-#include "gpxe/virtio-ring.h"
-#include "gpxe/virtio-pci.h"
+#include "ipxe/io.h"
+#include "ipxe/virtio-ring.h"
+#include "ipxe/virtio-pci.h"

 int vp_find_vq(unsigned int ioaddr, int queue_index,
               struct vring_virtqueue *vq)
--- a/src/drivers/bus/virtio-ring.c
+++ b/src/drivers/bus/virtio-ring.c
@@ -15,9 +15,9 @@
 */

 #include "etherboot.h"
-#include "gpxe/io.h"
-#include "gpxe/virtio-ring.h"
-#include "gpxe/virtio-pci.h"
+#include "ipxe/io.h"
+#include "ipxe/virtio-ring.h"
+#include "ipxe/virtio-pci.h"

 #define BUG() do { \
   printf("BUG: failure at %s:%d/%s()!\n", \
--- a/src/drivers/infiniband/arbel.c
+++ b/src/drivers/infiniband/arbel.c
@@ -29,14 +29,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <unistd.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/umalloc.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_smc.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/umalloc.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_smc.h>
 #include "arbel.h"

 /**
--- a/src/drivers/infiniband/arbel.h
+++ b/src/drivers/infiniband/arbel.h
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );

 #include <stdint.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 #include "mlx_bitops.h"
 #include "MT25218_PRM.h"

@@ -232,7 +232,7 @@ union arbelprm_mad {
 } __attribute__ (( packed ));

 /*
- * gPXE-specific definitions
+ * iPXE-specific definitions
 *
 */

--- a/src/drivers/infiniband/hermon.c
+++ b/src/drivers/infiniband/hermon.c
@@ -27,15 +27,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <unistd.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/pcibackup.h>
-#include <gpxe/malloc.h>
-#include <gpxe/umalloc.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_smc.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/pcibackup.h>
+#include <ipxe/malloc.h>
+#include <ipxe/umalloc.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_smc.h>
 #include "hermon.h"

 /**
--- a/src/drivers/infiniband/hermon.h
+++ b/src/drivers/infiniband/hermon.h
@@ -10,8 +10,8 @@
 FILE_LICENCE ( GPL2_OR_LATER );

 #include <stdint.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/ib_packet.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/ib_packet.h>
 #include "mlx_bitops.h"
 #include "MT25408_PRM.h"

@@ -273,7 +273,7 @@ union hermonprm_mad {
 } __attribute__ (( packed ));

 /*
- * gPXE-specific definitions
+ * iPXE-specific definitions
 *
 */

--- a/src/drivers/infiniband/linda.c
+++ b/src/drivers/infiniband/linda.c
@@ -23,13 +23,13 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <unistd.h>
 #include <assert.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/i2c.h>
-#include <gpxe/bitbash.h>
-#include <gpxe/malloc.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/i2c.h>
+#include <ipxe/bitbash.h>
+#include <ipxe/malloc.h>
+#include <ipxe/iobuf.h>
 #include "linda.h"

 /**
--- a/src/drivers/infiniband/linda.h
+++ b/src/drivers/infiniband/linda.h
@@ -29,7 +29,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 */

 #define BITOPS_LITTLE_ENDIAN
-#include <gpxe/bitops.h>
+#include <ipxe/bitops.h>
 #include "qib_7220_regs.h"

 struct ib_device;
--- a/src/drivers/net/3c509-eisa.c
+++ b/src/drivers/net/3c509-eisa.c
@@ -4,8 +4,8 @@
 *
 */

-#include <gpxe/eisa.h>
-#include <gpxe/isa.h>
+#include <ipxe/eisa.h>
+#include <ipxe/isa.h>
 #include "console.h"
 #include "3c509.h"

--- a/src/drivers/net/3c509.c
+++ b/src/drivers/net/3c509.c
@@ -10,10 +10,10 @@ FILE_LICENCE ( BSD2 );
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <unistd.h>
-#include <gpxe/device.h>
-#include <gpxe/isa.h>
+#include <ipxe/device.h>
+#include <ipxe/isa.h>
 #include "3c509.h"

 /*
--- a/src/drivers/net/3c515.c
+++ b/src/drivers/net/3c515.c
@@ -49,9 +49,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include "etherboot.h"
 /* to get the interface to the body of the program */
 #include "nic.h"
-#include <gpxe/isapnp.h>
-#include <gpxe/isa.h> /* for ISA_ROM */
-#include <gpxe/ethernet.h>
+#include <ipxe/isapnp.h>
+#include <ipxe/isa.h> /* for ISA_ROM */
+#include <ipxe/ethernet.h>

 static void t3c515_wait(unsigned int nticks)
 {
--- a/src/drivers/net/3c529.c
+++ b/src/drivers/net/3c529.c
@@ -6,8 +6,8 @@
 FILE_LICENCE ( BSD2 );

 #include "etherboot.h"
-#include <gpxe/mca.h>
-#include <gpxe/isa.h> /* for ISA_ROM */
+#include <ipxe/mca.h>
+#include <ipxe/isa.h> /* for ISA_ROM */
 #include "nic.h"
 #include "3c509.h"

--- a/src/drivers/net/3c595.c
+++ b/src/drivers/net/3c595.c
@@ -29,8 +29,8 @@ FILE_LICENCE ( BSD2 );

 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "3c595.h"

 static struct nic_operations t595_operations;
--- a/src/drivers/net/3c5x9.c
+++ b/src/drivers/net/3c5x9.c
@@ -26,10 +26,10 @@ FILE_LICENCE ( BSD2 );

 /* #define EDEBUG */

-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/isa.h>
+#include <ipxe/isa.h>
 #include "3c509.h"

 static enum { none, bnc, utp } connector = none;	/* for 3C509 */
--- a/src/drivers/net/3c90x.c
+++ b/src/drivers/net/3c90x.c
@@ -1,11 +1,11 @@
 /*
- * 3c90x.c -- This file implements a gPXE API 3c90x driver
+ * 3c90x.c -- This file implements a iPXE API 3c90x driver
 *
 * Originally written for etherboot by:
 *   Greg Beeley, Greg.Beeley@LightSys.org
 * Modified by Steve Smith,
 *   Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net).
- * Almost totally Rewritten to use gPXE API, implementation of tx/rx ring support
+ * Almost totally Rewritten to use iPXE API, implementation of tx/rx ring support
 *   by Thomas Miletich, thomas.miletich@gmail.com
 *   Thanks to Marty Connor and Stefan Hajnoczi for their help and feedback,
 *   and to Daniel Verkamp for his help with testing.
@@ -47,15 +47,15 @@ FILE_LICENCE ( BSD2 );
 #include <assert.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/timer.h>
-#include <gpxe/nvs.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/timer.h>
+#include <ipxe/nvs.h>

 #include "3c90x.h"

@@ -271,7 +271,7 @@ static int a3c90x_setup_tx_ring(struct INF_3C90X *p)

 /**
 * a3c90x_process_tx_packets - Checks for successfully sent packets,
- * reports them to gPXE with netdev_tx_complete();
+ * reports them to iPXE with netdev_tx_complete();
 *
 * @v netdev	Network device info
 */
@@ -513,7 +513,7 @@ static void a3c90x_free_rx_iobuf(struct INF_3C90X *p)

 /**
 * a3c90x_process_rx_packets - Checks for received packets,
- * reports them to gPXE with netdev_rx() or netdev_rx_err() if there was an
+ * reports them to iPXE with netdev_rx() or netdev_rx_err() if there was an
 * error while receiving the packet
 *
 * @v netdev	Network device info
@@ -608,7 +608,7 @@ static void a3c90x_free_resources(struct INF_3C90X *p)

 /**
 * a3c90x_remove - Routine to remove the card. Unregisters
- * the NIC from gPXE, disables RX/TX and resets the card.
+ * the NIC from iPXE, disables RX/TX and resets the card.
 *
 * @v pci	PCI device info
 */
--- a/src/drivers/net/3c90x.h
+++ b/src/drivers/net/3c90x.h
@@ -3,7 +3,7 @@
 * by Greg Beeley, Greg.Beeley@LightSys.org.  Modified by Steve Smith,
 * Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net).
 *
- * Port from etherboot to gPXE API, implementation of tx/rx ring support
+ * Port from etherboot to iPXE API, implementation of tx/rx ring support
 * by Thomas Miletich, thomas.miletich@gmail.com
 * Thanks to Marty Connor and Stefan Hajnoczi for their help and feedback.
 *
--- a/src/drivers/net/amd8111e.c
+++ b/src/drivers/net/amd8111e.c
@@ -33,8 +33,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include "etherboot.h"
 #include "nic.h"
 #include "mii.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "string.h"
 #include "stdint.h"
 #include "amd8111e.h"
--- a/src/drivers/net/ath5k/ath5k.c
+++ b/src/drivers/net/ath5k/ath5k.c
@@ -5,7 +5,7 @@
 * Copyright (c) 2007 Jiri Slaby <jirislaby@gmail.com>
 * Copyright (c) 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
 *
- * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
 * Original from Linux kernel 2.6.30.
 *
 * All rights reserved.
@@ -46,11 +46,11 @@
 FILE_LICENCE ( BSD3 );

 #include <stdlib.h>
-#include <gpxe/malloc.h>
-#include <gpxe/timer.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/pci_io.h>
+#include <ipxe/malloc.h>
+#include <ipxe/timer.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/pci_io.h>

 #include "base.h"
 #include "reg.h"
@@ -1239,7 +1239,7 @@ accept:
 		iob_put(iob, rs.rs_datalen);

 		/* The MAC header is padded to have 32-bit boundary if the
-		 * packet payload is non-zero. However, gPXE only
+		 * packet payload is non-zero. However, iPXE only
 		 * supports standard 802.11 packets with 24-byte
 		 * header, so no padding correction should be needed.
 		 */
@@ -1508,7 +1508,7 @@ ath5k_tx(struct net80211_device *dev, struct io_buffer *iob)

 	/*
 	 * The hardware expects the header padded to 4 byte boundaries.
-	 * gPXE only ever sends 24-byte headers, so no action necessary.
+	 * iPXE only ever sends 24-byte headers, so no action necessary.
 	 */

 	if (list_empty(&sc->txbuf)) {
--- a/src/drivers/net/ath5k/ath5k.h
+++ b/src/drivers/net/ath5k/ath5k.h
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2007 Reyk Floeter <reyk@openbsd.org>
 * Copyright (c) 2006-2007 Nick Kossifidis <mickflemm@gmail.com>
 *
- * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
 * Original from Linux kernel 2.6.30.
 *
 * Permission to use, copy, modify, and distribute this software for any
@@ -25,9 +25,9 @@ FILE_LICENCE ( MIT );

 #include <stddef.h>
 #include <byteswap.h>
-#include <gpxe/io.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/net80211.h>
+#include <ipxe/io.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/net80211.h>
 #include <errno.h>

 /* Keep all ath5k files under one errfile ID */
--- a/src/drivers/net/ath5k/ath5k_attach.c
+++ b/src/drivers/net/ath5k/ath5k_attach.c
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org>
 * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
 *
- * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
 * Original from Linux kernel 2.6.30.
 *
 * Permission to use, copy, modify, and distribute this software for any
@@ -25,7 +25,7 @@ FILE_LICENCE ( MIT );
 * Attach/Detach Functions and helpers *
 \*************************************/

-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include "ath5k.h"
--- a/src/drivers/net/ath5k/ath5k_caps.c
+++ b/src/drivers/net/ath5k/ath5k_caps.c
@@ -3,7 +3,7 @@
 * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
 * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
--- a/src/drivers/net/ath5k/ath5k_desc.c
+++ b/src/drivers/net/ath5k/ath5k_desc.c
@@ -3,7 +3,7 @@
 * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
 * Copyright (c) 2007-2008 Pavel Roskin <proski@gnu.org>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
--- a/src/drivers/net/ath5k/ath5k_dma.c
+++ b/src/drivers/net/ath5k/ath5k_dma.c
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org>
 * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
--- a/src/drivers/net/ath5k/ath5k_eeprom.c
+++ b/src/drivers/net/ath5k/ath5k_eeprom.c
@@ -3,7 +3,7 @@
 * Copyright (c) 2006-2009 Nick Kossifidis <mickflemm@gmail.com>
 * Copyright (c) 2008-2009 Felix Fietkau <nbd@openwrt.org>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
--- a/src/drivers/net/ath5k/ath5k_gpio.c
+++ b/src/drivers/net/ath5k/ath5k_gpio.c
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org>
 * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
--- a/src/drivers/net/ath5k/ath5k_initvals.c
+++ b/src/drivers/net/ath5k/ath5k_initvals.c
@@ -5,7 +5,7 @@
 * Copyright (c) 2006-2009 Nick Kossifidis <mickflemm@gmail.com>
 * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
--- a/src/drivers/net/ath5k/ath5k_pcu.c
+++ b/src/drivers/net/ath5k/ath5k_pcu.c
@@ -6,7 +6,7 @@
 * Copyright (c) 2007-2008 Pavel Roskin <proski@gnu.org>
 * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -43,7 +43,7 @@ FILE_LICENCE ( MIT );
 *
 * Initialize PCU for the various operating modes (AP/STA etc)
 *
- * For gPXE we always assume STA mode.
+ * For iPXE we always assume STA mode.
 */
 int ath5k_hw_set_opmode(struct ath5k_hw *ah)
 {
--- a/src/drivers/net/ath5k/ath5k_phy.c
+++ b/src/drivers/net/ath5k/ath5k_phy.c
@@ -6,7 +6,7 @@
 * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
 * Copyright (c) 2008-2009 Felix Fietkau <nbd@openwrt.org>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
--- a/src/drivers/net/ath5k/ath5k_qcu.c
+++ b/src/drivers/net/ath5k/ath5k_qcu.c
@@ -2,7 +2,7 @@
 * Copyright (c) 2004-2008 Reyk Floeter <reyk@openbsd.org>
 * Copyright (c) 2006-2008 Nick Kossifidis <mickflemm@gmail.com>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
--- a/src/drivers/net/ath5k/ath5k_reset.c
+++ b/src/drivers/net/ath5k/ath5k_reset.c
@@ -5,7 +5,7 @@
 * Copyright (c) 2007-2008 Pavel Roskin <proski@gnu.org>
 * Copyright (c) 2007-2008 Jiri Slaby <jirislaby@gmail.com>
 *
- * Lightly modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
+ * Lightly modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>.
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -29,7 +29,7 @@ FILE_LICENCE ( MIT );
  Reset functions and helpers
 \*****************************/

-#include <gpxe/pci.h> 		/* To determine if a card is pci-e */
+#include <ipxe/pci.h> 		/* To determine if a card is pci-e */
 #include <unistd.h>

 #include "ath5k.h"
--- a/src/drivers/net/ath5k/ath5k_rfkill.c
+++ b/src/drivers/net/ath5k/ath5k_rfkill.c
@@ -2,7 +2,7 @@
 * RFKILL support for ath5k
 *
 * Copyright (c) 2009 Tobias Doerffel <tobias.doerffel@gmail.com>
- * Lightly modified for gPXE, Sep 2008 by Joshua Oreman <oremanj@rwcr.net>
+ * Lightly modified for iPXE, Sep 2008 by Joshua Oreman <oremanj@rwcr.net>
 *
 * All rights reserved.
 *
--- a/src/drivers/net/ath5k/base.h
+++ b/src/drivers/net/ath5k/base.h
@@ -2,7 +2,7 @@
 * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting
 * All rights reserved.
 *
- * Modified for gPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, July 2009, by Joshua Oreman <oremanj@rwcr.net>
 * Original from Linux kernel 2.6.30.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@
 FILE_LICENCE ( BSD3 );

 #include "ath5k.h"
-#include <gpxe/iobuf.h>
+#include <ipxe/iobuf.h>

 #define	ATH_RXBUF	16		/* number of RX buffers */
 #define	ATH_TXBUF	16		/* number of TX buffers */
--- a/src/drivers/net/atl1e.c
+++ b/src/drivers/net/atl1e.c
@@ -4,7 +4,7 @@
 * Derived from Intel e1000 driver
 * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
 *
- * Modified for gPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>.
+ * Modified for iPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the Free
--- a/src/drivers/net/atl1e.h
+++ b/src/drivers/net/atl1e.h
@@ -5,7 +5,7 @@
 * Derived from Intel e1000 driver
 * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
 *
- * Modified for gPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, October 2009 by Joshua Oreman <oremanj@rwcr.net>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the Free
@@ -31,14 +31,14 @@
 #include <unistd.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
-#include <gpxe/pci_io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/io.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
+#include <ipxe/pci_io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/io.h>

 #define ETH_FCS_LEN	4
 #define VLAN_HLEN	4
--- a/src/drivers/net/b44.c
+++ b/src/drivers/net/b44.c
@@ -35,15 +35,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <unistd.h>
 #include <byteswap.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <mii.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/memmap.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/memmap.h>
 #include "b44.h"


@@ -628,7 +628,7 @@ static void b44_set_rx_mode(struct net_device *netdev)
 }


-/*** Implementation of gPXE driver callbacks ***/
+/*** Implementation of iPXE driver callbacks ***/

 /**
 * Probe device
--- a/src/drivers/net/bnx2.c
+++ b/src/drivers/net/bnx2.c
@@ -17,8 +17,8 @@ FILE_LICENCE ( GPL_ANY );
 #include "etherboot.h"
 #include "nic.h"
 #include <errno.h>
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "string.h"
 #include <mii.h>
 #include "bnx2.h"
--- a/src/drivers/net/cs89x0.c
+++ b/src/drivers/net/cs89x0.c
@@ -88,10 +88,10 @@ FILE_LICENCE ( GPL2_ONLY );
  */

 #include <errno.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/isa.h>
+#include <ipxe/isa.h>
 #include "console.h"
 #include "cs89x0.h"

--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -45,8 +45,8 @@ FILE_LICENCE ( GPL_ANY );

 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>

 #undef DAVICOM_DEBUG
 #undef DAVICOM_DEBUG_WHERE
--- a/src/drivers/net/depca.c
+++ b/src/drivers/net/depca.c
@@ -239,9 +239,9 @@ FILE_LICENCE ( GPL_ANY );

 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/isa.h>
+#include <ipxe/isa.h>
 #include "console.h"
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>

 /*
 ** I/O addresses. Note that the 2k buffer option is not supported in
--- a/src/drivers/net/dmfe.c
+++ b/src/drivers/net/dmfe.c
@@ -43,8 +43,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>

 /* #define EDEBUG 1 */
 #ifdef EDEBUG
--- a/src/drivers/net/e1000/e1000_api.h
+++ b/src/drivers/net/e1000/e1000_api.h
@@ -36,15 +36,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>

 #include "e1000_hw.h"

--- a/src/drivers/net/e1000/e1000_main.c
+++ b/src/drivers/net/e1000/e1000_main.c
@@ -541,7 +541,7 @@ void e1000_reset ( struct e1000_adapter *adapter )
 	e1000_init_manageability ( adapter );
 }

-/** Functions that implement the gPXE driver API **/
+/** Functions that implement the iPXE driver API **/

 /**
 * e1000_close - Disables a network interface
--- a/src/drivers/net/e1000e/e1000e.h
+++ b/src/drivers/net/e1000e/e1000e.h
@@ -38,15 +38,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>

 /* Begin OS Dependencies */

--- a/src/drivers/net/e1000e/e1000e_main.c
+++ b/src/drivers/net/e1000e/e1000e_main.c
@@ -860,7 +860,7 @@ static void e1000e_process_rx_packets ( struct net_device *netdev )
 	}
 }

-/** Functions that implement the gPXE driver API **/
+/** Functions that implement the iPXE driver API **/

 /**
 * e1000_close - Disables a network interface
--- a/src/drivers/net/eepro.c
+++ b/src/drivers/net/eepro.c
@@ -36,8 +36,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include "etherboot.h"
 #include <errno.h>
 #include "nic.h"
-#include <gpxe/isa.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/isa.h>
+#include <ipxe/ethernet.h>

 /* Different 82595 chips */
 #define LAN595		0
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -36,7 +36,7 @@
 *              Jul 25 1997  V1.00  REW     Tested by AW to work in a PROM
 *                                          Cleanup for publication
 *              Dez 11 2004  V1.10  Kiszka  Add RX ring buffer support
- *              Jun    2008  v2.0   mdeck   Updated to gPXE. Changed much.
+ *              Jun    2008  v2.0   mdeck   Updated to iPXE. Changed much.
 *
 * Cleanups and fixes by Thomas Miletich<thomas.miletich@gmail.com>
 *
@@ -60,12 +60,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
 *
 * Initialization
 *
- * ifec_pci_probe() is called by gPXE during initialization. Typical NIC
+ * ifec_pci_probe() is called by iPXE during initialization. Typical NIC
 * initialization is performed.  EEPROM data is read.
 *
 * Network Boot
 *
- * ifec_net_open() is called by gPXE before attempting to network boot from the
+ * ifec_net_open() is called by iPXE before attempting to network boot from the
 * card.  Here, the Command Unit & Receive Unit are initialized.  The tx & rx
 * rings are setup.  The MAC address is programmed and the card is configured.
 *
@@ -104,16 +104,16 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
-#include <gpxe/spi_bit.h>
-#include <gpxe/timer.h>
-#include <gpxe/nvs.h>
-#include <gpxe/threewire.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
+#include <ipxe/spi_bit.h>
+#include <ipxe/timer.h>
+#include <ipxe/nvs.h>
+#include <ipxe/threewire.h>
+#include <ipxe/netdevice.h>
 #include "eepro100.h"

 /****************************** Global data **********************************/
@@ -155,7 +155,7 @@ static struct net_device_operations ifec_operations = {
 	.irq      = ifec_net_irq
 };

-/******************* gPXE PCI Device Driver API functions ********************/
+/******************* iPXE PCI Device Driver API functions ********************/

 /*
 * Initialize the PCI device.
@@ -164,8 +164,8 @@ static struct net_device_operations ifec_operations = {
 * @v id  		The PCI device + vendor id.
 * @ret rc		Returns zero if successfully initialized.
 *
- * This function is called very early on, while gPXE is initializing.
- * This is a gPXE PCI Device Driver API function.
+ * This function is called very early on, while iPXE is initializing.
+ * This is a iPXE PCI Device Driver API function.
 */
 static int ifec_pci_probe ( struct pci_device *pci,
                            const struct pci_device_id *id __unused )
@@ -245,14 +245,14 @@ static void ifec_pci_remove ( struct pci_device *pci )
 	netdev_put        ( netdev );
 }

-/****************** gPXE Network Device Driver API functions *****************/
+/****************** iPXE Network Device Driver API functions *****************/

 /*
 * Close a network device.
 *
 * @v netdev		Device to close.
 *
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
 */
 static void ifec_net_close ( struct net_device *netdev )
 {
@@ -285,7 +285,7 @@ static void ifec_net_close ( struct net_device *netdev )
 * @v netdev		Device to control.
 * @v enable		Zero to mask off IRQ, non-zero to enable IRQ.
 *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
 */
 static void ifec_net_irq ( struct net_device *netdev, int enable )
 {
@@ -304,7 +304,7 @@ static void ifec_net_irq ( struct net_device *netdev, int enable )
 * @ret rc  		Non-zero if failed to open.
 *
 * This enables tx and rx on the device.
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
 */
 static int ifec_net_open ( struct net_device *netdev )
 {
@@ -393,9 +393,9 @@ error:
 *
 * @v netdev		Device being polled.
 *
- * This is called periodically by gPXE to let the driver check the status of
+ * This is called periodically by iPXE to let the driver check the status of
 * transmitted packets and to allow the driver to check for received packets.
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
 */
 static void ifec_net_poll ( struct net_device *netdev )
 {
@@ -431,7 +431,7 @@ static void ifec_net_poll ( struct net_device *netdev )
 * @v iobuf 		Data to transmit.
 * @ret rc  		Non-zero if failed to transmit.
 *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
 */
 static int ifec_net_transmit ( struct net_device *netdev,
                               struct io_buffer *iobuf )
@@ -993,7 +993,7 @@ static void ifec_tx_process ( struct net_device *netdev )
 	/* Check status of transmitted packets */
 	while ( ( status = tcb->status ) && tcb->iob ) {
 		if ( status & TCB_U ) {
-			/* report error to gPXE */
+			/* report error to iPXE */
 			DBG ( "ifec_tx_process : tx error!\n " );
 			netdev_tx_complete_err ( netdev, tcb->iob, -EINVAL );
 		} else {
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -7,8 +7,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define LINUX_OUT_MACROS

 #include "etherboot.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "nic.h"
 #include "console.h"
 #include "epic100.h"
--- a/src/drivers/net/etherfabric.c
+++ b/src/drivers/net/etherfabric.c
@@ -25,13 +25,13 @@ FILE_LICENCE ( GPL_ANY );
 #include <assert.h>
 #include <byteswap.h>
 #include <console.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/timer.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/timer.h>
 #include <mii.h>
 #include "etherfabric.h"
 #include "etherfabric_nic.h"
--- a/src/drivers/net/etherfabric_nic.h
+++ b/src/drivers/net/etherfabric_nic.h
@@ -20,11 +20,11 @@ FILE_LICENCE ( GPL_ANY );

 #ifndef EFAB_NIC_H
 #define  EFAB_NIC_H
-#include <gpxe/bitbash.h>
-#include <gpxe/i2c.h>
-#include <gpxe/spi.h>
-#include <gpxe/nvo.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/bitbash.h>
+#include <ipxe/i2c.h>
+#include <ipxe/spi.h>
+#include <ipxe/nvo.h>
+#include <ipxe/if_ether.h>
 /**************************************************************************
 *
 * Constants and macros
--- a/src/drivers/net/forcedeth.c
+++ b/src/drivers/net/forcedeth.c
@@ -50,9 +50,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 /* Include timer support functions */
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 #include "mii.h"

 #define drv_version "v1.2"
--- a/src/drivers/net/igb/igb_api.h
+++ b/src/drivers/net/igb/igb_api.h
@@ -35,15 +35,15 @@ FILE_LICENCE ( GPL2_ONLY );
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/malloc.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/malloc.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>

 #include "igb_hw.h"

--- a/src/drivers/net/igb/igb_main.c
+++ b/src/drivers/net/igb/igb_main.c
@@ -626,7 +626,7 @@ static void igb_process_rx_packets ( struct net_device *netdev )
 	}
 }

-/** Functions that implement the gPXE driver API **/
+/** Functions that implement the iPXE driver API **/

 /**
 * igb_close - Disables a network interface
--- a/src/drivers/net/ipoib.c
+++ b/src/drivers/net/ipoib.c
@@ -24,14 +24,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/errortab.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/infiniband.h>
-#include <gpxe/ib_pathrec.h>
-#include <gpxe/ib_mcast.h>
-#include <gpxe/ipoib.h>
+#include <ipxe/errortab.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/ib_pathrec.h>
+#include <ipxe/ib_mcast.h>
+#include <ipxe/ipoib.h>

 /** @file
 *
--- a/src/drivers/net/legacy.c
+++ b/src/drivers/net/legacy.c
@@ -1,10 +1,10 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
 #include <nic.h>

 /*
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -30,8 +30,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include <mii.h>

 /* Condensed operations for readability. */
--- a/src/drivers/net/mtnic.c
+++ b/src/drivers/net/mtnic.c
@@ -35,22 +35,22 @@ FILE_LICENCE ( GPL2_ONLY );

 #include <strings.h>
 #include <errno.h>
-#include <gpxe/malloc.h>
-#include <gpxe/umalloc.h>
+#include <ipxe/malloc.h>
+#include <ipxe/umalloc.h>
 #include <byteswap.h>
 #include <unistd.h>
-#include <gpxe/io.h>
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
+#include <ipxe/io.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
 #include "mtnic.h"


 /*


-    mtnic.c - gPXE driver for Mellanox 10Gig ConnectX EN
+    mtnic.c - iPXE driver for Mellanox 10Gig ConnectX EN


 */
--- a/src/drivers/net/myri10ge.c
+++ b/src/drivers/net/myri10ge.c
@@ -30,13 +30,13 @@ FILE_LICENCE ( GPL2_ONLY );
 *
 * Initialization
 *
- * myri10ge_pci_probe() is called by gPXE during initialization.
+ * myri10ge_pci_probe() is called by iPXE during initialization.
 * Minimal NIC initialization is performed to minimize resources
 * consumed when the driver is resident but unused.
 *
 * Network Boot
 *
- * myri10ge_net_open() is called by gPXE before attempting to network
+ * myri10ge_net_open() is called by iPXE before attempting to network
 * boot from the card.  Packet buffers are allocated and the NIC
 * interface is initialized.
 *
@@ -70,13 +70,13 @@ FILE_LICENCE ( GPL2_ONLY );

 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/timer.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/timer.h>

 #include "myri10ge_mcp.h"

@@ -484,7 +484,7 @@ static int mac_address_from_string_specs ( struct pci_device *pci,
 }

 /****************************************************************
- * gPXE PCI Device Driver API functions
+ * iPXE PCI Device Driver API functions
 ****************************************************************/

 /*
@@ -494,8 +494,8 @@ static int mac_address_from_string_specs ( struct pci_device *pci,
 * @v id  		The PCI device + vendor id.
 * @ret rc		Returns zero if successfully initialized.
 *
- * This function is called very early on, while gPXE is initializing.
- * This is a gPXE PCI Device Driver API function.
+ * This function is called very early on, while iPXE is initializing.
+ * This is a iPXE PCI Device Driver API function.
 */
 static int myri10ge_pci_probe ( struct pci_device *pci,
 				const struct pci_device_id *id __unused )
@@ -586,7 +586,7 @@ static void myri10ge_pci_remove ( struct pci_device *pci )
 }

 /****************************************************************
- * gPXE Network Device Driver Operations
+ * iPXE Network Device Driver Operations
 ****************************************************************/

 /*
@@ -594,7 +594,7 @@ static void myri10ge_pci_remove ( struct pci_device *pci )
 *
 * @v netdev		Device to close.
 *
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
 */
 static void myri10ge_net_close ( struct net_device *netdev )
 {
@@ -638,7 +638,7 @@ static void myri10ge_net_close ( struct net_device *netdev )
 * @v netdev		Device to control.
 * @v enable		Zero to mask off IRQ, non-zero to enable IRQ.
 *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
 */
 static void myri10ge_net_irq ( struct net_device *netdev, int enable )
 {
@@ -666,7 +666,7 @@ static void myri10ge_net_irq ( struct net_device *netdev, int enable )
 * @ret rc  		Non-zero if failed to open.
 *
 * This enables tx and rx on the device.
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
 */
 static int myri10ge_net_open ( struct net_device *netdev )
 {
@@ -759,7 +759,7 @@ static int myri10ge_net_open ( struct net_device *netdev )
 		     | netdev->ll_addr[5] );
 	TRY ( SET_ , MAC_ADDRESS , );

-	/* Enable multicast receives, because some gPXE clients don't work
+	/* Enable multicast receives, because some iPXE clients don't work
 	   without multicast. . */

 	TRY ( ENABLE_ , ALLMULTI , );
@@ -870,9 +870,9 @@ abort_with_nothing:
 *
 * @v netdev		Device being polled.
 *
- * This is called periodically by gPXE to let the driver check the status of
+ * This is called periodically by iPXE to let the driver check the status of
 * transmitted packets and to allow the driver to check for received packets.
- * This is a gPXE Network Device Driver API function.
+ * This is a iPXE Network Device Driver API function.
 */
 static void myri10ge_net_poll ( struct net_device *netdev )
 {
@@ -951,7 +951,7 @@ static void myri10ge_net_poll ( struct net_device *netdev )
 * @v iobuf 		Data to transmit.
 * @ret rc  		Non-zero if failed to transmit.
 *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
 */
 static int myri10ge_net_transmit ( struct net_device *netdev,
 				   struct io_buffer *iobuf )
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -1,5 +1,5 @@
 /* 
-   natsemi.c - gPXE driver for the NatSemi DP8381x series. 
+   natsemi.c - iPXE driver for the NatSemi DP8381x series.
 
   Based on:

@@ -51,7 +51,7 @@ FILE_LICENCE ( GPL_ANY );
 /* Revision History */

 /*
-  02 Jul 2007  Udayan Kumar	 1.2 ported the driver from etherboot to gPXE API.
+  02 Jul 2007  Udayan Kumar	 1.2 ported the driver from etherboot to iPXE API.
 				     Fully rewritten,adapting the old driver.
 		      	      	     Added a circular buffer for transmit and receive.
 		                     transmit routine will not wait for transmission to finish.
@@ -64,18 +64,18 @@ FILE_LICENCE ( GPL_ANY );
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <byteswap.h>
 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/spi_bit.h>
-#include <gpxe/threewire.h>
-#include <gpxe/nvo.h>
+#include <ipxe/pci.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/spi_bit.h>
+#include <ipxe/threewire.h>
+#include <ipxe/nvo.h>
 #include "natsemi.h"

 /*  Function Prototypes: */
--- a/src/drivers/net/ne2k_isa.c
+++ b/src/drivers/net/ne2k_isa.c
@@ -24,8 +24,8 @@ FILE_LICENCE ( BSD2 );
 #include "ns8390.h"
 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/ethernet.h>
-#include <gpxe/isa.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/isa.h>
 #include <errno.h>

 #define ASIC_PIO NE_DATA
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -42,7 +42,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /* to get the interface to the body of the program */
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>

 #if ARCH == ia64		/* Support 64-bit addressing */
 #define USE_64BIT_ADDR
--- a/src/drivers/net/ns8390.c
+++ b/src/drivers/net/ns8390.c
@@ -41,11 +41,11 @@ FILE_LICENCE ( BSD2 );
 #include "etherboot.h"
 #include "nic.h"
 #include "ns8390.h"
-#include <gpxe/ethernet.h>
+#include <ipxe/ethernet.h>
 #ifdef	INCLUDE_NS8390
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #else
-#include <gpxe/isa.h>
+#include <ipxe/isa.h>
 #endif

 static unsigned char	eth_vendor, eth_flags;
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -43,8 +43,8 @@ FILE_LICENCE ( GPL2_OR_LATER );

 #include "etherboot.h"
 #include "nic.h"
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>
 #include "mii.h"

 /* void hex_dump(const char *data, const unsigned int len); */
--- a/src/drivers/net/phantom/phantom.c
+++ b/src/drivers/net/phantom/phantom.c
@@ -26,15 +26,15 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <errno.h>
 #include <assert.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/io.h>
-#include <gpxe/malloc.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/spi.h>
-#include <gpxe/settings.h>
+#include <ipxe/pci.h>
+#include <ipxe/io.h>
+#include <ipxe/malloc.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/spi.h>
+#include <ipxe/settings.h>
 #include "phantom.h"

 /**
@@ -1075,7 +1075,7 @@ static void phantom_poll_link_state ( struct net_device *netdev ) {
 	       phantom, xg_state_p3, phantom->link_state );
 	phantom->link_state = xg_state_p3;

-	/* Indicate link state to gPXE */
+	/* Indicate link state to iPXE */
 	link = UNM_NIC_REG_XG_STATE_P3_LINK ( phantom->port,
 					      phantom->link_state );
 	switch ( link ) {
@@ -1659,7 +1659,7 @@ static int phantom_clp_fetch ( struct phantom_nic *phantom, unsigned int port,

 /** A Phantom CLP setting */
 struct phantom_clp_setting {
-	/** gPXE setting */
+	/** iPXE setting */
 	struct setting *setting;
 	/** Setting number */
 	unsigned int clp_setting;
@@ -1673,7 +1673,7 @@ static struct phantom_clp_setting clp_settings[] = {
 /**
 * Find Phantom CLP setting
 *
- * @v setting		gPXE setting
+ * @v setting		iPXE setting
 * @v clp_setting	Setting number, or 0 if not found
 */
 static unsigned int
@@ -1716,7 +1716,7 @@ static int phantom_store_setting ( struct settings *settings,
 	unsigned int clp_setting;
 	int rc;

-	/* Find Phantom setting equivalent to gPXE setting */
+	/* Find Phantom setting equivalent to iPXE setting */
 	clp_setting = phantom_clp_setting ( phantom, setting );
 	if ( ! clp_setting )
 		return -ENOTSUP;
@@ -1750,7 +1750,7 @@ static int phantom_fetch_setting ( struct settings *settings,
 	int read_len;
 	int rc;

-	/* Find Phantom setting equivalent to gPXE setting */
+	/* Find Phantom setting equivalent to iPXE setting */
 	clp_setting = phantom_clp_setting ( phantom, setting );
 	if ( ! clp_setting )
 		return -ENOTSUP;
@@ -1985,7 +1985,7 @@ static void phantom_get_macaddr ( struct phantom_nic *phantom,
 * one per port.  To allow individual ports to be selectively
 * enabled/disabled for PXE boot (as required), we must therefore
 * leave the expansion ROM always enabled, and place the per-port
- * enable/disable logic within the gPXE driver.
+ * enable/disable logic within the iPXE driver.
 */
 static int phantom_check_boot_enable ( struct phantom_nic *phantom ) {
 	unsigned long boot_enable;
--- a/src/drivers/net/pnic.c
+++ b/src/drivers/net/pnic.c
@@ -16,13 +16,13 @@ FILE_LICENCE ( GPL2_OR_LATER );

 #include <stdint.h>
 #include <stdio.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
-#include <gpxe/pci.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>

 #include "pnic_api.h"

--- a/src/drivers/net/prism2.c
+++ b/src/drivers/net/prism2.c
@@ -17,8 +17,8 @@ FILE_LICENCE ( GPL2_OR_LATER );

 #include <etherboot.h>
 #include <nic.h>
-#include <gpxe/pci.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/pci.h>
+#include <ipxe/ethernet.h>

 /*
 * Hard-coded SSID
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -16,7 +16,7 @@ $Id$

 FILE_LICENCE ( GPL2_OR_LATER );

-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <nic.h>

 #define WLAN_HOSTIF WLAN_PCI
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -16,7 +16,7 @@ $Id$

 FILE_LICENCE ( GPL2_OR_LATER );

-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <nic.h>

 #define WLAN_HOSTIF WLAN_PLX
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -33,14 +33,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <assert.h>
 #include <byteswap.h>
 #include <errno.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/timer.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/timer.h>
 #include <mii.h>

 #include "r8169.h"
@@ -1577,7 +1577,7 @@ static void rtl_hw_start_8101(struct net_device *dev)
 	//        RTL_W16(IntrMask, tp->intr_event);
 }

-/*** gPXE API Support Routines ***/
+/*** iPXE API Support Routines ***/

 /**
 * setup_tx_resources - allocate tx resources (descriptors)
@@ -1818,7 +1818,7 @@ rtl8169_free_rx_resources ( struct rtl8169_private *tp )
 }

 /**
-    FIXME: Because gPXE's pci_device_id structure does not contain a
+    FIXME: Because iPXE's pci_device_id structure does not contain a
    field to contain arbitrary data, we need the following table to
    associate PCI IDs with nic variants, because a lot of driver
    routines depend on knowing which kind of variant they are dealing
@@ -1881,7 +1881,7 @@ static void rtl8169_irq_disable ( struct rtl8169_private *tp )
 	rtl8169_irq_mask_and_ack ( ioaddr );
 }

-/*** gPXE Core API Routines ***/
+/*** iPXE Core API Routines ***/

 /**
 * open - Called when a network interface is made active
@@ -2103,7 +2103,7 @@ rtl8169_probe ( struct pci_device *pdev, const struct pci_device_id *ent )
 	struct rtl8169_private *tp;
 	void *ioaddr;

-	/** FIXME: This lookup is necessary because gPXE does not have a "data"
+	/** FIXME: This lookup is necessary because iPXE does not have a "data"
 	    element in the structure pci_device_id which can pass an arbitrary
 	    piece of data to the driver.  It might be useful to add it. Then we
 	    could just use ent->data instead of having to look up cfg_index.
--- a/src/drivers/net/r8169.h
+++ b/src/drivers/net/r8169.h
@@ -32,7 +32,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

 /** FIXME: include/linux/pci_regs.h has these PCI regs, maybe
-	   we need such a file in gPXE?
+	   we need such a file in iPXE?
 **/
 #define  PCI_EXP_DEVCTL	        8	/* Device Control */
 #define  PCI_EXP_DEVCTL_READRQ	0x7000	/* Max_Read_Request_Size */
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -72,18 +72,18 @@ FILE_LICENCE ( GPL_ANY );
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <errno.h>
 #include <unistd.h>
 #include <byteswap.h>
-#include <gpxe/pci.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/spi_bit.h>
-#include <gpxe/threewire.h>
-#include <gpxe/nvo.h>
+#include <ipxe/pci.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/spi_bit.h>
+#include <ipxe/threewire.h>
+#include <ipxe/nvo.h>

 #define TX_RING_SIZE 4

--- a/src/drivers/net/rtl818x/rtl8180.c
+++ b/src/drivers/net/rtl818x/rtl8180.c
@@ -2,7 +2,7 @@

 FILE_LICENCE(GPL2_OR_LATER);

-#include <gpxe/pci.h>
+#include <ipxe/pci.h>

 REQUIRE_OBJECT(rtl818x);
 REQUIRE_OBJECT(rtl8180_grf5101);
--- a/src/drivers/net/rtl818x/rtl8180_grf5101.c
+++ b/src/drivers/net/rtl818x/rtl8180_grf5101.c
@@ -3,7 +3,7 @@
 *
 * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
 *
- * Modified slightly for gPXE, June 2009 by Joshua Oreman.
+ * Modified slightly for iPXE, June 2009 by Joshua Oreman.
 *
 * Code from the BSD driver and the rtl8181 project have been
 * very useful to understand certain things
@@ -21,8 +21,8 @@
 */

 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>

 #include "rtl818x.h"

--- a/src/drivers/net/rtl818x/rtl8180_max2820.c
+++ b/src/drivers/net/rtl818x/rtl8180_max2820.c
@@ -3,7 +3,7 @@
 *
 * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
 *
- * Modified slightly for gPXE, June 2009 by Joshua Oreman.
+ * Modified slightly for iPXE, June 2009 by Joshua Oreman.
 *
 * Code from the BSD driver and the rtl8181 project have been
 * very useful to understand certain things
@@ -21,8 +21,8 @@
 */

 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>

 #include "rtl818x.h"

--- a/src/drivers/net/rtl818x/rtl8180_sa2400.c
+++ b/src/drivers/net/rtl818x/rtl8180_sa2400.c
@@ -3,7 +3,7 @@
 *
 * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
 *
- * Modified slightly for gPXE, June 2009 by Joshua Oreman.
+ * Modified slightly for iPXE, June 2009 by Joshua Oreman.
 *
 * Code from the BSD driver and the rtl8181 project have been
 * very useful to understand certain things
@@ -21,8 +21,8 @@
 */

 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>

 #include "rtl818x.h"

--- a/src/drivers/net/rtl818x/rtl8185.c
+++ b/src/drivers/net/rtl818x/rtl8185.c
@@ -2,7 +2,7 @@

 FILE_LICENCE(GPL2_OR_LATER);

-#include <gpxe/pci.h>
+#include <ipxe/pci.h>

 REQUIRE_OBJECT(rtl818x);
 REQUIRE_OBJECT(rtl8185_rtl8225);
--- a/src/drivers/net/rtl818x/rtl8185_rtl8225.c
+++ b/src/drivers/net/rtl818x/rtl8185_rtl8225.c
@@ -4,7 +4,7 @@
 * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
 * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
 *
- * Modified slightly for gPXE, June 2009 by Joshua Oreman
+ * Modified slightly for iPXE, June 2009 by Joshua Oreman
 *
 * Based on the r8180 driver, which is:
 * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
@@ -17,8 +17,8 @@
 */

 #include <unistd.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>

 #include "rtl818x.h"

--- a/src/drivers/net/rtl818x/rtl818x.c
+++ b/src/drivers/net/rtl818x/rtl818x.c
@@ -5,7 +5,7 @@
 * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
 * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
 *
- * Modified for gPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net>
 *
 * Based on the r8180 driver, which is:
 * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al.
@@ -24,12 +24,12 @@ FILE_LICENCE(GPL2_ONLY);
 #include <stdio.h>
 #include <unistd.h>
 #include <byteswap.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
-#include <gpxe/net80211.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/threewire.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
+#include <ipxe/net80211.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/threewire.h>

 #include "rtl818x.h"

--- a/src/drivers/net/rtl818x/rtl818x.h
+++ b/src/drivers/net/rtl818x/rtl818x.h
@@ -4,7 +4,7 @@
 * Copyright 2007 Michael Wu <flamingice@sourmilk.net>
 * Copyright 2007 Andrea Merello <andreamrl@tiscali.it>
 *
- * Modified for gPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net>
+ * Modified for iPXE, June 2009, by Joshua Oreman <oremanj@rwcr.net>
 *
 * Based on the r8187 driver, which is:
 * Copyright 2005 Andrea Merello <andreamrl@tiscali.it>, et al.
@@ -17,8 +17,8 @@
 #ifndef RTL818X_H
 #define RTL818X_H

-#include <gpxe/spi_bit.h>
-#include <gpxe/tables.h>
+#include <ipxe/spi_bit.h>
+#include <ipxe/tables.h>

 FILE_LICENCE(GPL2_ONLY);

--- a/src/drivers/net/sis190.c
+++ b/src/drivers/net/sis190.c
@@ -5,7 +5,7 @@
   Copyright (c) 2003, 2004 Jeff Garzik <jgarzik@pobox.com>
   Copyright (c) 2003, 2004, 2005 Francois Romieu <romieu@fr.zoreil.com>

-   Modified for gPXE 2009 by Thomas Miletich <thomas.miletich@gmail.com>
+   Modified for iPXE 2009 by Thomas Miletich <thomas.miletich@gmail.com>

   Based on r8169.c, tg3.c, 8139cp.c, skge.c, epic100.c and SiS 190/191
   genuine driver.
--- a/src/drivers/net/sis190.h
+++ b/src/drivers/net/sis190.h
@@ -13,14 +13,14 @@ FILE_LICENCE ( GPL_ANY );
 #include <byteswap.h>
 #include <errno.h>
 #include <mii.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/pci.h>
-#include <gpxe/timer.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/pci.h>
+#include <ipxe/timer.h>

 #define PCI_VENDOR_ID_SI	0x1039

--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -46,7 +46,7 @@ FILE_LICENCE ( GPL_ANY );
 /* Includes */

 #include "etherboot.h"
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include "nic.h"

 #include "sis900.h"
--- a/src/drivers/net/skge.c
+++ b/src/drivers/net/skge.c
@@ -1,5 +1,5 @@
 /*
- * gPXE driver for Marvell Yukon chipset and SysKonnect Gigabit
+ * iPXE driver for Marvell Yukon chipset and SysKonnect Gigabit
 * Ethernet adapters. Derived from Linux skge driver (v1.13), which was
 * based on earlier sk98lin, e100 and FreeBSD if_sk drivers.
 *
@@ -9,7 +9,7 @@
 *
 * Copyright (C) 2004, 2005 Stephen Hemminger <shemminger@osdl.org>
 *
- * Modified for gPXE, July 2008 by Michael Decker <mrd999@gmail.com>
+ * Modified for iPXE, July 2008 by Michael Decker <mrd999@gmail.com>
 * Tested and Modified in December 2009 by
 *    Thomas Miletich <thomas.miletich@gmail.com>
 *
@@ -33,12 +33,12 @@ FILE_LICENCE ( GPL2_ONLY );
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>

 #include "skge.h"

@@ -1724,7 +1724,7 @@ static int skge_up(struct net_device *dev)

 	assert(!(skge->dma & 7));

-	/* FIXME: find out whether 64 bit gPXE will be loaded > 4GB */
+	/* FIXME: find out whether 64 bit iPXE will be loaded > 4GB */
 	if ((u64)skge->dma >> 32 != ((u64) skge->dma + RING_SIZE) >> 32) {
 		DBG(PFX "pci_alloc_consistent region crosses 4G boundary\n");
 		err = -EINVAL;
@@ -2450,7 +2450,7 @@ static void skge_remove(struct pci_device *pdev)
 * @v netdev		Device to control.
 * @v enable		Zero to mask off IRQ, non-zero to enable IRQ.
 *
- * This is a gPXE Network Driver API function.
+ * This is a iPXE Network Driver API function.
 */
 static void skge_net_irq ( struct net_device *dev, int enable ) {
 	struct skge_port *skge = netdev_priv(dev);
--- a/src/drivers/net/skge.h
+++ b/src/drivers/net/skge.h
@@ -35,7 +35,7 @@ FILE_LICENCE ( GPL2_ONLY );

 #define SKGE_EEPROM_MAGIC	0x9933aabb

-/* Added for gPXE ------------------ */
+/* Added for iPXE ------------------ */

 /* from ethtool.h */
 #define AUTONEG_DISABLE	0x00
--- a/src/drivers/net/sky2.c
+++ b/src/drivers/net/sky2.c
@@ -1,5 +1,5 @@
 /*
- * gPXE driver for Marvell Yukon 2 chipset. Derived from Linux sky2 driver
+ * iPXE driver for Marvell Yukon 2 chipset. Derived from Linux sky2 driver
 * (v1.22), which was based on earlier sk98lin and skge drivers.
 *
 * This driver intentionally does not support all the features
@@ -8,7 +8,7 @@
 *
 * Copyright (C) 2005 Stephen Hemminger <shemminger@osdl.org>
 *
- * Modified for gPXE, April 2009 by Joshua Oreman
+ * Modified for iPXE, April 2009 by Joshua Oreman
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -30,11 +30,11 @@ FILE_LICENCE ( GPL2_ONLY );
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/malloc.h>
-#include <gpxe/pci.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/malloc.h>
+#include <ipxe/pci.h>
 #include <byteswap.h>
 #include <mii.h>

@@ -1016,7 +1016,7 @@ static struct io_buffer *sky2_rx_alloc(struct sky2_port *sky2)
 	 * Cards with a RAM buffer hang in the rx FIFO if the
 	 * receive buffer isn't aligned to (Linux module comments say
 	 * 64 bytes, Linux module code says 8 bytes). Since io_buffers
-	 * are always 2kb-aligned under gPXE, just leave it be
+	 * are always 2kb-aligned under iPXE, just leave it be
 	 * without ETH_DATA_ALIGN in those cases.
 	 *
 	 * XXX This causes unaligned access to the IP header,
--- a/src/drivers/net/sky2.h
+++ b/src/drivers/net/sky2.h
@@ -6,7 +6,7 @@

 FILE_LICENCE ( GPL2_ONLY );

-/* Added for gPXE ------------------ */
+/* Added for iPXE ------------------ */

 /* These were defined in Linux ethtool.h. Their values are arbitrary;
   they aid only in bookkeeping for the driver. */
--- a/Show More
+++ b/Show More