[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>

src/include/assert.h

@@ -54,7 +54,7 @@ assert_printf ( const char *fmt, ... ) asm ( "printf" );
  * If the condition is not true, the link will fail with an unresolved
  * symbol (error_symbol).
  *
- * This macro is gPXE-specific.  Do not use this macro in code
+ * This macro is iPXE-specific.  Do not use this macro in code
  * intended to be portable.
  *
  */

src/include/compiler.h

@@ -538,7 +538,7 @@ int __debug_disable;
  * @defgroup licences Licence declarations
  *
  * For reasons that are partly historical, various different files
- * within the gPXE codebase have differing licences.
+ * within the iPXE codebase have differing licences.
  *
  * @{
  */

src/include/console.h

@@ -1,7 +1,7 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 /** @file
  *

src/include/curses.h

@@ -194,9 +194,9 @@ extern unsigned short _LINES;
 #define COLORS		COLOURS
 
 /*
- * KEY code constants are define in gpxe/keys.h
+ * KEY code constants are define in ipxe/keys.h
  */
-#include <gpxe/keys.h>
+#include <ipxe/keys.h>
 
 //extern int addch ( const chtype * );
 //extern int addchnstr ( const chtype *, int );

src/include/errno.h

@@ -7,7 +7,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  * Error codes
  *
- * Return status codes as used within gPXE are designed to allow for
+ * Return status codes as used within iPXE are designed to allow for
  * maximum visibility into the source of an error even in an end-user
  * build with no debugging.  They are constructed as follows:
  *
@@ -72,7 +72,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 /* Get definitions for file identifiers */
-#include <gpxe/errfile.h>
+#include <ipxe/errfile.h>
 
 /* If we do not have a valid file identifier, generate a compiler
  * warning upon usage of any error codes.  (Don't just use a #warning,
@@ -85,7 +85,7 @@ extern char missing_errfile_declaration[] __attribute__ (( deprecated ));
 #define ERRFILE ( 0 * ( ( int ) missing_errfile_declaration ) )
 #endif
 
-/** Derive PXENV_STATUS code from gPXE error number */
+/** Derive PXENV_STATUS code from iPXE error number */
 #define PXENV_STATUS( rc ) ( (-(rc)) & 0x00ff )
 
 /**

src/include/etherboot.h

@@ -15,9 +15,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <unistd.h>
 #include <strings.h>
 #include <console.h>
-#include <gpxe/timer.h>
-#include <gpxe/if_arp.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/timer.h>
+#include <ipxe/if_arp.h>
+#include <ipxe/if_ether.h>
 
 typedef unsigned long Address;
 

src/include/ipxe/acpi.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_ACPI_H
-#define _GPXE_ACPI_H
+#ifndef _IPXE_ACPI_H
+#define _IPXE_ACPI_H
 
 /** @file
  *
@@ -40,4 +40,4 @@ struct acpi_description_header {
 
 extern void acpi_fix_checksum ( struct acpi_description_header *acpi );
 
-#endif /* _GPXE_ACPI_H */
+#endif /* _IPXE_ACPI_H */

src/include/ipxe/aes.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_AES_H
-#define _GPXE_AES_H
+#ifndef _IPXE_AES_H
+#define _IPXE_AES_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -27,4 +27,4 @@ extern struct cipher_algorithm aes_cbc_algorithm;
 int aes_wrap ( const void *kek, const void *src, void *dest, int nblk );
 int aes_unwrap ( const void *kek, const void *src, void *dest, int nblk );
 
-#endif /* _GPXE_AES_H */
+#endif /* _IPXE_AES_H */

src/include/ipxe/ansiesc.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_ANSIESC_H
-#define _GPXE_ANSIESC_H
+#ifndef _IPXE_ANSIESC_H
+#define _IPXE_ANSIESC_H
 
 /** @file
  *
@@ -117,4 +117,4 @@ struct ansiesc_context {
 
 extern int ansiesc_process ( struct ansiesc_context *ctx, int c );
 
-#endif /* _GPXE_ANSIESC_H */
+#endif /* _IPXE_ANSIESC_H */

src/include/ipxe/aoe.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_AOE_H
-#define _GPXE_AOE_H
+#ifndef _IPXE_AOE_H
+#define _IPXE_AOE_H
 
 /** @file
  *
@@ -10,10 +10,10 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/list.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/retry.h>
-#include <gpxe/ata.h>
+#include <ipxe/list.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/retry.h>
+#include <ipxe/ata.h>
 
 /** An AoE config command */
 struct aoecfg {
@@ -147,4 +147,4 @@ extern void aoe_detach ( struct ata_device *ata );
 extern int aoe_attach ( struct ata_device *ata, struct net_device *netdev,
 			const char *root_path );
 
-#endif /* _GPXE_AOE_H */
+#endif /* _IPXE_AOE_H */

src/include/ipxe/api.h

@@ -1,11 +1,11 @@
-#ifndef _GPXE_API_H
-#define _GPXE_API_H
+#ifndef _IPXE_API_H
+#define _IPXE_API_H
 
 /** @file
  *
- * gPXE internal APIs
+ * iPXE internal APIs
  *
- * There are various formally-defined APIs internal to gPXE, with
+ * There are various formally-defined APIs internal to iPXE, with
  * several differing implementations specific to particular execution
  * environments (e.g. PC BIOS, EFI, LinuxBIOS).
  *
@@ -81,4 +81,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 /** @} */
 
-#endif /* _GPXE_API_H */
+#endif /* _IPXE_API_H */

src/include/ipxe/arc4.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_ARC4_H
-#define _GPXE_ARC4_H
+#ifndef _IPXE_ARC4_H
+#define _IPXE_ARC4_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
@@ -19,4 +19,4 @@ extern struct cipher_algorithm arc4_algorithm;
 void arc4_skip ( const void *key, size_t keylen, size_t skip,
 		 const void *src, void *dst, size_t msglen );
 
-#endif /* _GPXE_ARC4_H */
+#endif /* _IPXE_ARC4_H */

src/include/ipxe/arp.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_ARP_H
-#define _GPXE_ARP_H
+#ifndef _IPXE_ARP_H
+#define _IPXE_ARP_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 struct net_device;
 struct net_protocol;
@@ -43,4 +43,4 @@ extern int arp_resolve ( struct net_device *netdev,
 			 const void *source_net_addr,
 			 void *dest_ll_addr );
 
-#endif /* _GPXE_ARP_H */
+#endif /* _IPXE_ARP_H */

src/include/ipxe/asn1.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_ASN1_H
-#define _GPXE_ASN1_H
+#ifndef _IPXE_ASN1_H
+#define _IPXE_ASN1_H
 
 /** @file
  *
@@ -31,4 +31,4 @@ struct asn1_cursor {
 extern int asn1_enter ( struct asn1_cursor *cursor, unsigned int type );
 extern int asn1_skip ( struct asn1_cursor *cursor, unsigned int type );
 
-#endif /* _GPXE_ASN1_H */
+#endif /* _IPXE_ASN1_H */

src/include/ipxe/ata.h

@@ -1,10 +1,10 @@
-#ifndef _GPXE_ATA_H
-#define _GPXE_ATA_H
+#ifndef _IPXE_ATA_H
+#define _IPXE_ATA_H
 
 #include <stdint.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/refcnt.h>
 
 /** @file
  *
@@ -206,4 +206,4 @@ struct ata_device {
 
 extern int init_atadev ( struct ata_device *ata );
 
-#endif /* _GPXE_ATA_H */
+#endif /* _IPXE_ATA_H */

src/include/ipxe/base64.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_BASE64_H
-#define _GPXE_BASE64_H
+#ifndef _IPXE_BASE64_H
+#define _IPXE_BASE64_H
 
 /** @file
  *
@@ -23,4 +23,4 @@ static inline size_t base64_encoded_len ( size_t raw_len ) {
 
 extern void base64_encode ( const char *raw, char *encoded );
 
-#endif /* _GPXE_BASE64_H */
+#endif /* _IPXE_BASE64_H */

src/include/ipxe/bitbash.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_BITBASH_H
-#define _GPXE_BITBASH_H
+#ifndef _IPXE_BITBASH_H
+#define _IPXE_BITBASH_H
 
 /** @file
  *
@@ -49,4 +49,4 @@ extern void write_bit ( struct bit_basher *basher, unsigned int bit_id,
 			unsigned long data );
 extern int read_bit ( struct bit_basher *basher, unsigned int bit_id );
 
-#endif /* _GPXE_BITBASH_H */
+#endif /* _IPXE_BITBASH_H */

src/include/ipxe/bitmap.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_BITMAP_H
-#define _GPXE_BITMAP_H
+#ifndef _IPXE_BITMAP_H
+#define _IPXE_BITMAP_H
 
 /** @file
  *
@@ -82,4 +82,4 @@ static inline int bitmap_full ( struct bitmap *bitmap ) {
 	return ( bitmap->first_gap == bitmap->length );
 }
 
-#endif /* _GPXE_BITMAP_H */
+#endif /* _IPXE_BITMAP_H */

src/include/ipxe/bitops.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_BITOPS_H
-#define _GPXE_BITOPS_H
+#ifndef _IPXE_BITOPS_H
+#define _IPXE_BITOPS_H
 
 /*
  * Copyright (C) 2008 Michael Brown <mbrown@fensystems.co.uk>.
@@ -227,4 +227,4 @@ typedef unsigned char pseudo_bit_t;
 		*__ptr |= cpu_to_BIT64 ( __value << __shift );		      \
 	} while ( 0 )
 
-#endif /* _GPXE_BITOPS_H */
+#endif /* _IPXE_BITOPS_H */

src/include/ipxe/blockdev.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_BLOCKDEV_H
-#define _GPXE_BLOCKDEV_H
+#ifndef _IPXE_BLOCKDEV_H
+#define _IPXE_BLOCKDEV_H
 
 /**
  * @file
@@ -10,7 +10,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 struct block_device;
 
@@ -50,4 +50,4 @@ struct block_device {
 	uint64_t blocks;
 };
 
-#endif /* _GPXE_BLOCKDEV_H */
+#endif /* _IPXE_BLOCKDEV_H */

src/include/ipxe/cbc.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_CBC_H
-#define _GPXE_CBC_H
+#ifndef _IPXE_CBC_H
+#define _IPXE_CBC_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/crypto.h>
+#include <ipxe/crypto.h>
 
 /**
  * Set key
@@ -97,4 +97,4 @@ struct cipher_algorithm _cbc_cipher = {					\
 	.decrypt	= _cbc_name ## _decrypt,			\
 };
 
-#endif /* _GPXE_CBC_H */
+#endif /* _IPXE_CBC_H */

src/include/ipxe/chap.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_CHAP_H
-#define _GPXE_CHAP_H
+#ifndef _IPXE_CHAP_H
+#define _IPXE_CHAP_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/md5.h>
+#include <ipxe/md5.h>
 
 struct digest_algorithm;
 
@@ -50,4 +50,4 @@ static inline void chap_set_identifier ( struct chap_response *chap,
 	chap_update ( chap, &ident_byte, sizeof ( ident_byte ) );
 }
 
-#endif /* _GPXE_CHAP_H */
+#endif /* _IPXE_CHAP_H */

src/include/ipxe/command.h

@@ -1,9 +1,9 @@
-#ifndef _GPXE_COMMAND_H
-#define _GPXE_COMMAND_H
+#ifndef _IPXE_COMMAND_H
+#define _IPXE_COMMAND_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 /** A command-line command */
 struct command {
@@ -23,4 +23,4 @@ struct command {
 
 #define __command __table_entry ( COMMANDS, 01 )
 
-#endif /* _GPXE_COMMAND_H */
+#endif /* _IPXE_COMMAND_H */

src/include/ipxe/cpio.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_CPIO_H
-#define _GPXE_CPIO_H
+#ifndef _IPXE_CPIO_H
+#define _IPXE_CPIO_H
 
 /** @file
  *
@@ -50,4 +50,4 @@ struct cpio_header {
 
 extern void cpio_set_field ( char *field, unsigned long value );
 
-#endif /* _GPXE_CPIO_H */
+#endif /* _IPXE_CPIO_H */

src/include/ipxe/crc32.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_CRC32_H
-#define _GPXE_CRC32_H
+#ifndef _IPXE_CRC32_H
+#define _IPXE_CRC32_H
 
 FILE_LICENCE ( GPL2_OR_LATER );
 

src/include/ipxe/crypto.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_CRYPTO_H
-#define _GPXE_CRYPTO_H
+#ifndef _IPXE_CRYPTO_H
+#define _IPXE_CRYPTO_H
 
 /** @file
  *
@@ -153,4 +153,4 @@ extern struct pubkey_algorithm pubkey_null;
 
 void get_random_bytes ( void *buf, size_t len );
 
-#endif /* _GPXE_CRYPTO_H */
+#endif /* _IPXE_CRYPTO_H */

src/include/ipxe/device.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_DEVICE_H
-#define _GPXE_DEVICE_H
+#ifndef _IPXE_DEVICE_H
+#define _IPXE_DEVICE_H
 
 /**
  * @file
@@ -10,8 +10,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/list.h>
-#include <gpxe/tables.h>
+#include <ipxe/list.h>
+#include <ipxe/tables.h>
 
 /** A hardware device description */
 struct device_description {
@@ -110,4 +110,4 @@ struct root_driver {
 /** Declare a root device */
 #define __root_device __table_entry ( ROOT_DEVICES, 01 )
 
-#endif /* _GPXE_DEVICE_H */
+#endif /* _IPXE_DEVICE_H */

src/include/ipxe/dhcp.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_DHCP_H
-#define _GPXE_DHCP_H
+#ifndef _IPXE_DHCP_H
+#define _IPXE_DHCP_H
 
 /** @file
  *
@@ -10,13 +10,13 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/in.h>
-#include <gpxe/list.h>
-#include <gpxe/refcnt.h>
-#include <gpxe/tables.h>
-#include <gpxe/uuid.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/in.h>
+#include <ipxe/list.h>
+#include <ipxe/refcnt.h>
+#include <ipxe/tables.h>
+#include <ipxe/uuid.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/uaccess.h>
 
 struct job_interface;
 struct dhcp_options;
@@ -291,7 +291,7 @@ struct dhcp_client_uuid {
 
 /** Keep SAN drive registered
  *
- * If set to a non-zero value, gPXE will not detach any SAN drive
+ * If set to a non-zero value, iPXE will not detach any SAN drive
  * after failing to boot from it.  (This option is required in order
  * to perform a Windows Server 2008 installation direct to an iSCSI
  * target.)
@@ -305,7 +305,7 @@ struct dhcp_client_uuid {
 
 /** Skip PXE DHCP protocol extensions such as ProxyDHCP
  *
- * If set to a non-zero value, gPXE will not wait for ProxyDHCP offers
+ * If set to a non-zero value, iPXE will not wait for ProxyDHCP offers
  * and will ignore any PXE-specific DHCP options that it receives.
  */
 #define DHCP_EB_NO_PXEDHCP DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xb0 )
@@ -386,7 +386,7 @@ struct dhcp_netdev_desc {
  */
 #define DHCP_EB_REVERSE_PASSWORD DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xc1 )
 
-/** gPXE version number */
+/** iPXE version number */
 #define DHCP_EB_VERSION DHCP_ENCAP_OPT ( DHCP_EB_ENCAP, 0xeb )
 
 /** iSCSI primary target IQN */
@@ -634,4 +634,4 @@ __weak_decl ( void, get_cached_dhcpack, ( void ), (), );
 
 extern void store_cached_dhcpack ( userptr_t data, size_t len );
 
-#endif /* _GPXE_DHCP_H */
+#endif /* _IPXE_DHCP_H */

src/include/ipxe/dhcpopts.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_DHCPOPTS_H
-#define _GPXE_DHCPOPTS_H
+#ifndef _IPXE_DHCPOPTS_H
+#define _IPXE_DHCPOPTS_H
 
 /** @file
  *
@@ -31,4 +31,4 @@ extern int dhcpopt_fetch ( struct dhcp_options *options, unsigned int tag,
 extern void dhcpopt_init ( struct dhcp_options *options,
 			   void *data, size_t max_len );
 
-#endif /* _GPXE_DHCPOPTS_H */
+#endif /* _IPXE_DHCPOPTS_H */

src/include/ipxe/dhcppkt.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_DHCPPKT_H
-#define _GPXE_DHCPPKT_H
+#ifndef _IPXE_DHCPPKT_H
+#define _IPXE_DHCPPKT_H
 
 /** @file
  *
@@ -9,9 +9,9 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/dhcp.h>
-#include <gpxe/dhcpopts.h>
-#include <gpxe/refcnt.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/dhcpopts.h>
+#include <ipxe/refcnt.h>
 
 /**
  * A DHCP packet
@@ -61,4 +61,4 @@ extern int dhcppkt_fetch ( struct dhcp_packet *dhcppkt, unsigned int tag,
 extern void dhcppkt_init ( struct dhcp_packet *dhcppkt, 
 			   struct dhcphdr *data, size_t len );
 
-#endif /* _GPXE_DHCPPKT_H */
+#endif /* _IPXE_DHCPPKT_H */

src/include/ipxe/dns.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_DNS_H
-#define _GPXE_DNS_H
+#ifndef _IPXE_DNS_H
+#define _IPXE_DNS_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/in.h>
+#include <ipxe/in.h>
 
 /*
  * Constants
@@ -89,4 +89,4 @@ union dns_rr_info {
 	struct dns_rr_info_cname cname;
 };
 
-#endif /* _GPXE_DNS_H */
+#endif /* _IPXE_DNS_H */

src/include/ipxe/downloader.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_DOWNLOADER_H
-#define _GPXE_DOWNLOADER_H
+#ifndef _IPXE_DOWNLOADER_H
+#define _IPXE_DOWNLOADER_H
 
 /** @file
  *
@@ -16,4 +16,4 @@ extern int create_downloader ( struct job_interface *job, struct image *image,
 			       int ( * register_image ) ( struct image *image ),
 			       int type, ... );
 
-#endif /* _GPXE_DOWNLOADER_H */
+#endif /* _IPXE_DOWNLOADER_H */

src/include/ipxe/eapol.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef _GPXE_EAPOL_H
-#define _GPXE_EAPOL_H
+#ifndef _IPXE_EAPOL_H
+#define _IPXE_EAPOL_H
 
 /** @file
  *
@@ -26,7 +26,7 @@
  * them are elsewhere.
  */
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 #include <stdint.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
@@ -109,4 +109,4 @@ struct eapol_handler
 extern struct net_protocol eapol_protocol __net_protocol;
 
 
-#endif /* _GPXE_EAPOL_H */
+#endif /* _IPXE_EAPOL_H */

src/include/ipxe/editbox.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_EDITBOX_H
-#define _GPXE_EDITBOX_H
+#ifndef _IPXE_EDITBOX_H
+#define _IPXE_EDITBOX_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <curses.h>
-#include <gpxe/editstring.h>
+#include <ipxe/editstring.h>
 
 /** An editable text box widget */
 struct edit_box {
@@ -58,4 +58,4 @@ static inline int edit_editbox ( struct edit_box *box, int key ) {
 	return edit_string ( &box->string, key );
 }
 
-#endif /* _GPXE_EDITBOX_H */
+#endif /* _IPXE_EDITBOX_H */

src/include/ipxe/editstring.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_EDITSTRING_H
-#define _GPXE_EDITSTRING_H
+#ifndef _IPXE_EDITSTRING_H
+#define _IPXE_EDITSTRING_H
 
 /** @file
  *
@@ -30,4 +30,4 @@ struct edit_string {
 
 extern int edit_string ( struct edit_string *string, int key ) __nonnull;
 
-#endif /* _GPXE_EDITSTRING_H */
+#endif /* _IPXE_EDITSTRING_H */

src/include/ipxe/efi/Base.h

@@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 // Include processor specific binding
 //
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 typedef struct {
   UINT32  Data1;

src/include/ipxe/efi/LICENCE

@@ -37,4 +37,4 @@ following licence:
 
 This licence applies only to files that are part of the EFI
 Development Kit.  Other files may contain their own licence terms, or
-may fall under the standard gPXE GPL licence.
+may fall under the standard iPXE GPL licence.

src/include/ipxe/efi/Pi/PiBootMode.h

@@ -18,7 +18,7 @@
 #ifndef __PI_BOOT_MODE_H__
 #define __PI_BOOT_MODE_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 ///
 /// EFI boot mode

src/include/ipxe/efi/Pi/PiDxeCis.h

@@ -18,7 +18,7 @@
 #ifndef __PI_DXECIS_H__
 #define __PI_DXECIS_H__
 
-#include <gpxe/efi/Pi/PiMultiPhase.h>
+#include <ipxe/efi/Pi/PiMultiPhase.h>
 
 ///
 /// Global Coherencey Domain types - Memory type

src/include/ipxe/efi/Pi/PiFirmwareFile.h

@@ -19,7 +19,7 @@
 #ifndef __PI_FIRMWARE_FILE_H__
 #define __PI_FIRMWARE_FILE_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 #pragma pack(1)
 ///

src/include/ipxe/efi/Pi/PiFirmwareVolume.h

@@ -18,7 +18,7 @@
 #ifndef __PI_FIRMWAREVOLUME_H__
 #define __PI_FIRMWAREVOLUME_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 ///
 /// EFI_FV_FILE_ATTRIBUTES

src/include/ipxe/efi/Pi/PiHob.h

@@ -18,10 +18,10 @@
 #ifndef __PI_HOB_H__
 #define __PI_HOB_H__
 
-#include <gpxe/efi/ProcessorBind.h>
-#include <gpxe/efi/Pi/PiBootMode.h>
-#include <gpxe/efi/Uefi/UefiBaseType.h>
-#include <gpxe/efi/Uefi/UefiMultiPhase.h>
+#include <ipxe/efi/ProcessorBind.h>
+#include <ipxe/efi/Pi/PiBootMode.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+#include <ipxe/efi/Uefi/UefiMultiPhase.h>
 
 //
 // HobType of EFI_HOB_GENERIC_HEADER.

src/include/ipxe/efi/Pi/PiMultiPhase.h

@@ -18,14 +18,14 @@
 #ifndef __PI_MULTIPHASE_H__
 #define __PI_MULTIPHASE_H__
 
-#include <gpxe/efi/Uefi/UefiMultiPhase.h>
+#include <ipxe/efi/Uefi/UefiMultiPhase.h>
 
-#include <gpxe/efi/Pi/PiFirmwareVolume.h>
-#include <gpxe/efi/Pi/PiFirmwareFile.h>
-#include <gpxe/efi/Pi/PiBootMode.h>
+#include <ipxe/efi/Pi/PiFirmwareVolume.h>
+#include <ipxe/efi/Pi/PiFirmwareFile.h>
+#include <ipxe/efi/Pi/PiBootMode.h>
 
-#include <gpxe/efi/Pi/PiHob.h>
-#include <gpxe/efi/Pi/PiDependency.h>
+#include <ipxe/efi/Pi/PiHob.h>
+#include <ipxe/efi/Pi/PiDependency.h>
 
 
 #define EFI_NOT_AVAILABLE_YET   EFIERR (32)

src/include/ipxe/efi/PiDxe.h

@@ -16,10 +16,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __PI_DXE_H__
 #define __PI_DXE_H__
 
-#include <gpxe/efi/Uefi/UefiBaseType.h>
-#include <gpxe/efi/Uefi/UefiSpec.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+#include <ipxe/efi/Uefi/UefiSpec.h>
 
-#include <gpxe/efi/Pi/PiDxeCis.h>
+#include <ipxe/efi/Pi/PiDxeCis.h>
 
 #endif
 

src/include/ipxe/efi/ProcessorBind.h

@@ -6,9 +6,9 @@
  */
 
 #if __i386__
-#include <gpxe/efi/Ia32/ProcessorBind.h>
+#include <ipxe/efi/Ia32/ProcessorBind.h>
 #endif
 
 #if __x86_64__
-#include <gpxe/efi/X64/ProcessorBind.h>
+#include <ipxe/efi/X64/ProcessorBind.h>
 #endif

src/include/ipxe/efi/Protocol/Cpu.h

@@ -17,7 +17,7 @@
 #ifndef __ARCH_PROTOCOL_CPU_H__
 #define __ARCH_PROTOCOL_CPU_H__
 
-#include <gpxe/efi/Protocol/DebugSupport.h>
+#include <ipxe/efi/Protocol/DebugSupport.h>
 
 #define EFI_CPU_ARCH_PROTOCOL_GUID \
   { 0x26baccb1, 0x6f42, 0x11d4, {0xbc, 0xe7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } }

src/include/ipxe/efi/Protocol/CpuIo.h

@@ -22,7 +22,7 @@
 #ifndef _CPUIO_H_
 #define _CPUIO_H_
 
-#include <gpxe/efi/PiDxe.h>
+#include <ipxe/efi/PiDxe.h>
 
 #define EFI_CPU_IO_PROTOCOL_GUID \
   { \

src/include/ipxe/efi/Protocol/DebugSupport.h

@@ -19,8 +19,8 @@
 #ifndef __DEBUG_SUPPORT_H__
 #define __DEBUG_SUPPORT_H__
 
-#include <gpxe/efi/ProcessorBind.h>
-#include <gpxe/efi/IndustryStandard/PeImage.h>
+#include <ipxe/efi/ProcessorBind.h>
+#include <ipxe/efi/IndustryStandard/PeImage.h>
 
 typedef struct _EFI_DEBUG_SUPPORT_PROTOCOL EFI_DEBUG_SUPPORT_PROTOCOL;
 

src/include/ipxe/efi/Protocol/DevicePath.h

@@ -19,7 +19,7 @@
 #ifndef __EFI_DEVICE_PATH_PROTOCOL_H__
 #define __EFI_DEVICE_PATH_PROTOCOL_H__
 
-#include <gpxe/efi/Guid/PcAnsi.h>
+#include <ipxe/efi/Guid/PcAnsi.h>
 
 ///
 /// Device Path protocol

src/include/ipxe/efi/Protocol/DriverBinding.h

@@ -18,7 +18,7 @@
 #ifndef __EFI_DRIVER_BINDING_H__
 #define __EFI_DRIVER_BINDING_H__
 
-#include <gpxe/efi/Protocol/DevicePath.h>
+#include <ipxe/efi/Protocol/DevicePath.h>
 ///
 /// Global ID for the ControllerHandle Driver Protocol
 ///

src/include/ipxe/efi/Protocol/SimpleTextIn.h

@@ -18,7 +18,7 @@
 #ifndef __SIMPLE_TEXT_IN_PROTOCOL_H__
 #define __SIMPLE_TEXT_IN_PROTOCOL_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 #define EFI_SIMPLE_TEXT_INPUT_PROTOCOL_GUID \
   { \

src/include/ipxe/efi/Uefi.h

@@ -20,8 +20,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __PI_UEFI_H__
 #define __PI_UEFI_H__
 
-#include <gpxe/efi/Uefi/UefiBaseType.h>
-#include <gpxe/efi/Uefi/UefiSpec.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+#include <ipxe/efi/Uefi/UefiSpec.h>
 
 #endif
 

src/include/ipxe/efi/Uefi/UefiBaseType.h

@@ -15,7 +15,7 @@
 #ifndef __UEFI_BASETYPE_H__
 #define __UEFI_BASETYPE_H__
 
-#include <gpxe/efi/Base.h>
+#include <ipxe/efi/Base.h>
 
 //
 // Basical data type definitions introduced in UEFI.

src/include/ipxe/efi/Uefi/UefiMultiPhase.h

@@ -15,7 +15,7 @@
 #ifndef __UEFI_MULTIPHASE_H__
 #define __UEFI_MULTIPHASE_H__
 
-#include <gpxe/efi/ProcessorBind.h>
+#include <ipxe/efi/ProcessorBind.h>
 
 ///
 /// Enumeration of memory types introduced in UEFI.

src/include/ipxe/efi/Uefi/UefiSpec.h

@@ -19,11 +19,11 @@
 #ifndef __UEFI_SPEC_H__
 #define __UEFI_SPEC_H__
 
-#include <gpxe/efi/Uefi/UefiMultiPhase.h>
+#include <ipxe/efi/Uefi/UefiMultiPhase.h>
 
-#include <gpxe/efi/Protocol/DevicePath.h>
-#include <gpxe/efi/Protocol/SimpleTextIn.h>
-#include <gpxe/efi/Protocol/SimpleTextOut.h>
+#include <ipxe/efi/Protocol/DevicePath.h>
+#include <ipxe/efi/Protocol/SimpleTextIn.h>
+#include <ipxe/efi/Protocol/SimpleTextOut.h>
 
 ///
 /// Enumeration of memory allocation.
@@ -1909,8 +1909,8 @@ typedef struct {
   #error Unknown Processor Type
 #endif
 
-#include <gpxe/efi/Uefi/UefiPxe.h>
-#include <gpxe/efi/Uefi/UefiGpt.h>
-#include <gpxe/efi/Uefi/UefiInternalFormRepresentation.h>
+#include <ipxe/efi/Uefi/UefiPxe.h>
+#include <ipxe/efi/Uefi/UefiGpt.h>
+#include <ipxe/efi/Uefi/UefiInternalFormRepresentation.h>
 
 #endif

src/include/ipxe/efi/efi.h

@@ -6,7 +6,7 @@
  * EFI API
  *
  * The intention is to include near-verbatim copies of the EFI headers
- * required by gPXE.  This is achieved using the import.pl script in
+ * required by iPXE.  This is achieved using the import.pl script in
  * this directory.  Run the import script to update the local copies
  * of the headers:
  *
@@ -16,7 +16,7 @@
  * EFI Development Kit.
  *
  * Note that import.pl will modify any #include lines in each imported
- * header to reflect its new location within the gPXE tree.  It will
+ * header to reflect its new location within the iPXE tree.  It will
  * also tidy up the file by removing carriage return characters and
  * trailing whitespace.
  *
@@ -37,23 +37,23 @@
 #endif
 
 /* Include the top-level EFI header files */
-#include <gpxe/efi/Uefi.h>
-#include <gpxe/efi/PiDxe.h>
+#include <ipxe/efi/Uefi.h>
+#include <ipxe/efi/PiDxe.h>
 
 /* Reset any trailing #pragma pack directives */
 #pragma pack(1)
 #pragma pack()
 
-#include <gpxe/tables.h>
-#include <gpxe/uuid.h>
+#include <ipxe/tables.h>
+#include <ipxe/uuid.h>
 
-/** An EFI protocol used by gPXE */
+/** An EFI protocol used by iPXE */
 struct efi_protocol {
 	/** GUID */
 	union {
 		/** EFI protocol GUID */
 		EFI_GUID guid;
-		/** UUID structure understood by gPXE */
+		/** UUID structure understood by iPXE */
 		union uuid uuid;
 	} u;
 	/** Variable containing pointer to protocol structure */
@@ -63,10 +63,10 @@ struct efi_protocol {
 /** EFI protocol table */
 #define EFI_PROTOCOLS __table ( struct efi_protocol, "efi_protocols" )
 
-/** Declare an EFI protocol used by gPXE */
+/** Declare an EFI protocol used by iPXE */
 #define __efi_protocol __table_entry ( EFI_PROTOCOLS, 01 )
 
-/** Declare an EFI protocol to be required by gPXE
+/** Declare an EFI protocol to be required by iPXE
  *
  * @v _protocol		EFI protocol name
  * @v _ptr		Pointer to protocol instance
@@ -79,13 +79,13 @@ struct efi_protocol {
 				(_ptr) : (_ptr) ) ),			     \
 	}
 
-/** An EFI configuration table used by gPXE */
+/** An EFI configuration table used by iPXE */
 struct efi_config_table {
 	/** GUID */
 	union {
 		/** EFI configuration table GUID */
 		EFI_GUID guid;
-		/** UUID structure understood by gPXE */
+		/** UUID structure understood by iPXE */
 		union uuid uuid;
 	} u;
 	/** Variable containing pointer to configuration table */
@@ -98,10 +98,10 @@ struct efi_config_table {
 #define EFI_CONFIG_TABLES \
 	__table ( struct efi_config_table, "efi_config_tables" )
 
-/** Declare an EFI configuration table used by gPXE */
+/** Declare an EFI configuration table used by iPXE */
 #define __efi_config_table __table_entry ( EFI_CONFIG_TABLES, 01 )
 
-/** Declare an EFI configuration table to be used by gPXE
+/** Declare an EFI configuration table to be used by iPXE
  *
  * @v _table		EFI configuration table name
  * @v _ptr		Pointer to configuration table
@@ -114,9 +114,9 @@ struct efi_config_table {
 		.required = (_required),				     \
 	}
 
-/** Convert a gPXE status code to an EFI status code
+/** Convert a iPXE status code to an EFI status code
  *
- * FIXME: actually perform some kind of conversion.  gPXE error codes
+ * FIXME: actually perform some kind of conversion.  iPXE error codes
  * will be detected as EFI error codes; both have the top bit set, and
  * the success return code is zero for both.  Anything that just
  * reports a numerical error will be OK, anything attempting to
@@ -125,7 +125,7 @@ struct efi_config_table {
  */
 #define RC_TO_EFIRC( rc ) (rc)
 
-/** Convert an EFI status code to a gPXE status code
+/** Convert an EFI status code to a iPXE status code
  *
  * FIXME: as above
  */

src/include/ipxe/efi/efi_io.h

@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_IO_H
-#define _GPXE_EFI_IO_H
+#ifndef _IPXE_EFI_IO_H
+#define _IPXE_EFI_IO_H
 
 /** @file
  *
- * gPXE I/O API for EFI
+ * iPXE I/O API for EFI
  *
  * EFI runs with flat physical addressing, so the various mappings
  * between virtual addresses, I/O addresses and bus addresses are all
@@ -177,4 +177,4 @@ IOAPI_INLINE ( efi, mb ) ( void ) {
 	 */
 }
 
-#endif /* _GPXE_EFI_IO_H */
+#endif /* _IPXE_EFI_IO_H */

src/include/ipxe/efi/efi_pci.h

@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_PCI_H
-#define _GPXE_EFI_PCI_H
+#ifndef _IPXE_EFI_PCI_H
+#define _IPXE_EFI_PCI_H
 
 /** @file
  *
- * gPXE PCI I/O API for EFI
+ * iPXE PCI I/O API for EFI
  *
  */
 
@@ -145,4 +145,4 @@ PCIAPI_INLINE ( efi, pci_write_config_dword ) ( struct pci_device *pci,
 			      value );
 }
 
-#endif /* _GPXE_EFI_PCI_H */
+#endif /* _IPXE_EFI_PCI_H */

src/include/ipxe/efi/efi_smbios.h

@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_SMBIOS_H
-#define _GPXE_EFI_SMBIOS_H
+#ifndef _IPXE_EFI_SMBIOS_H
+#define _IPXE_EFI_SMBIOS_H
 
 /** @file
  *
- * gPXE SMBIOS API for EFI
+ * iPXE SMBIOS API for EFI
  *
  */
 
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define SMBIOS_PREFIX_efi __efi_
 #endif
 
-#endif /* _GPXE_EFI_SMBIOS_H */
+#endif /* _IPXE_EFI_SMBIOS_H */

src/include/ipxe/efi/efi_timer.h

@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_TIMER_H
-#define _GPXE_EFI_TIMER_H
+#ifndef _IPXE_EFI_TIMER_H
+#define _IPXE_EFI_TIMER_H
 
 /** @file
  *
- * gPXE timer API for EFI
+ * iPXE timer API for EFI
  *
  */
 
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define TIMER_PREFIX_efi __efi_
 #endif
 
-#endif /* _GPXE_EFI_TIMER_H */
+#endif /* _IPXE_EFI_TIMER_H */

src/include/ipxe/efi/efi_uaccess.h

@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_UACCESS_H
-#define _GPXE_EFI_UACCESS_H
+#ifndef _IPXE_EFI_UACCESS_H
+#define _IPXE_EFI_UACCESS_H
 
 /** @file
  *
- * gPXE user access API for EFI
+ * iPXE user access API for EFI
  *
  * EFI runs with flat physical addressing, so the various mappings
  * between virtual addresses, I/O addresses and bus addresses are all
@@ -87,4 +87,4 @@ UACCESS_INLINE ( efi, memchr_user ) ( userptr_t buffer, off_t offset,
 	return trivial_memchr_user ( buffer, offset, c, len );
 }
 
-#endif /* _GPXE_EFI_UACCESS_H */
+#endif /* _IPXE_EFI_UACCESS_H */

src/include/ipxe/efi/efi_umalloc.h

@@ -1,9 +1,9 @@
-#ifndef _GPXE_EFI_UMALLOC_H
-#define _GPXE_EFI_UMALLOC_H
+#ifndef _IPXE_EFI_UMALLOC_H
+#define _IPXE_EFI_UMALLOC_H
 
 /** @file
  *
- * gPXE user memory allocation API for EFI
+ * iPXE user memory allocation API for EFI
  *
  */
 
@@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define UMALLOC_PREFIX_efi __efi_
 #endif
 
-#endif /* _GPXE_EFI_UMALLOC_H */
+#endif /* _IPXE_EFI_UMALLOC_H */

src/include/ipxe/efi/import.pl

@@ -8,7 +8,7 @@ use strict;
 use warnings;
 
 sub try_import_file {
-  my $gpxedir = shift;
+  my $ipxedir = shift;
   my $edkdirs = shift;
   my $filename = shift;
 
@@ -16,7 +16,7 @@ sub try_import_file {
   return unless $filename =~ /\.h$/;
   print "$filename...";
 
-  my $outfile = catfile ( $gpxedir, $filename );
+  my $outfile = catfile ( $ipxedir, $filename );
   foreach my $edkdir ( @$edkdirs ) {
     my $infile = catfile ( $edkdir, $filename );
     if ( -e $infile ) {
@@ -33,7 +33,7 @@ sub try_import_file {
 	s/\s*$//g;
 	chomp;
 	# Update include lines, and record included files
-	if ( s/^\#include\s+[<\"](\S+)[>\"]/\#include <gpxe\/efi\/$1>/ ) {
+	if ( s/^\#include\s+[<\"](\S+)[>\"]/\#include <ipxe\/efi\/$1>/ ) {
 	  push @dependencies, $1;
 	}
 	print $outfh "$_\n";
@@ -42,9 +42,9 @@ sub try_import_file {
       close $infh;
       # Recurse to handle any included files that we don't already have
       foreach my $dependency ( @dependencies ) {
-	if ( ! -e catfile ( $gpxedir, $dependency ) ) {
+	if ( ! -e catfile ( $ipxedir, $dependency ) ) {
 	  print "...following dependency on $dependency\n";
-	  try_import_file ( $gpxedir, $edkdirs, $dependency );
+	  try_import_file ( $ipxedir, $edkdirs, $dependency );
 	}
       }
       return;
@@ -61,15 +61,15 @@ die "Directory \"$edktop\" does not appear to contain the EFI EDK2\n"
 my $edkdirs = [ catfile ( $edktop, "MdePkg/Include" ),
 		catfile ( $edktop, "IntelFrameworkPkg/Include" ) ];
 
-# Identify gPXE EFI includes directory
-my $gpxedir = $FindBin::Bin;
-die "Directory \"$gpxedir\" does not appear to contain the gPXE EFI includes\n"
-    unless -e catfile ( $gpxedir, "../../../include/gpxe/efi" );
+# Identify iPXE EFI includes directory
+my $ipxedir = $FindBin::Bin;
+die "Directory \"$ipxedir\" does not appear to contain the iPXE EFI includes\n"
+    unless -e catfile ( $ipxedir, "../../../include/ipxe/efi" );
 
-print "Importing EFI headers into $gpxedir\nfrom ";
+print "Importing EFI headers into $ipxedir\nfrom ";
 print join ( "\n and ", @$edkdirs )."\n";
 
 # Import headers
 find ( { wanted => sub {
-  try_import_file ( $gpxedir, $edkdirs, abs2rel ( $_, $gpxedir ) );
-}, no_chdir => 1 }, $gpxedir );
+  try_import_file ( $ipxedir, $edkdirs, abs2rel ( $_, $ipxedir ) );
+}, no_chdir => 1 }, $ipxedir );

src/include/ipxe/eisa.h

@@ -4,9 +4,9 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/isa_ids.h>
-#include <gpxe/device.h>
-#include <gpxe/tables.h>
+#include <ipxe/isa_ids.h>
+#include <ipxe/device.h>
+#include <ipxe/tables.h>
 
 /*
  * EISA constants

src/include/ipxe/elf.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_ELF_H
-#define _GPXE_ELF_H
+#ifndef _IPXE_ELF_H
+#define _IPXE_ELF_H
 
 /**
  * @file
@@ -14,4 +14,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 extern int elf_load ( struct image *image );
 
-#endif /* _GPXE_ELF_H */
+#endif /* _IPXE_ELF_H */

src/include/ipxe/errfile.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_ERRFILE_H
-#define _GPXE_ERRFILE_H
+#ifndef _IPXE_ERRFILE_H
+#define _IPXE_ERRFILE_H
 
 /** @file
  *
@@ -208,4 +208,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 /** @} */
 
-#endif /* _GPXE_ERRFILE_H */
+#endif /* _IPXE_ERRFILE_H */

src/include/ipxe/errortab.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_ERRORTAB_H
-#define _GPXE_ERRORTAB_H
+#ifndef _IPXE_ERRORTAB_H
+#define _IPXE_ERRORTAB_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 
 struct errortab {
 	int errno;
@@ -20,4 +20,4 @@ struct errortab {
 
 #define __errortab __table_entry ( ERRORTAB, 01 )
 
-#endif /* _GPXE_ERRORTAB_H */
+#endif /* _IPXE_ERRORTAB_H */

src/include/ipxe/ethernet.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_ETHERNET_H
-#define _GPXE_ETHERNET_H
+#ifndef _IPXE_ETHERNET_H
+#define _IPXE_ETHERNET_H
 
 /** @file
  *
@@ -18,4 +18,4 @@ extern int eth_mc_hash ( unsigned int af, const void *net_addr,
 extern int eth_eth_addr ( const void *ll_addr, void *eth_addr );
 extern struct net_device * alloc_etherdev ( size_t priv_size );
 
-#endif /* _GPXE_ETHERNET_H */
+#endif /* _IPXE_ETHERNET_H */

src/include/ipxe/fakedhcp.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_FAKEDHCP_H
-#define _GPXE_FAKEDHCP_H
+#ifndef _IPXE_FAKEDHCP_H
+#define _IPXE_FAKEDHCP_H
 
 /** @file
  *
@@ -20,4 +20,4 @@ extern int create_fakedhcpack ( struct net_device *netdev,
 extern int create_fakepxebsack ( struct net_device *netdev,
 				 void *data, size_t max_len );
 
-#endif /* _GPXE_FAKEDHCP_H */
+#endif /* _IPXE_FAKEDHCP_H */

src/include/ipxe/features.h

@@ -1,9 +1,9 @@
-#ifndef _GPXE_FEATURES_H
-#define _GPXE_FEATURES_H
+#ifndef _IPXE_FEATURES_H
+#define _IPXE_FEATURES_H
 
 #include <stdint.h>
-#include <gpxe/tables.h>
-#include <gpxe/dhcp.h>
+#include <ipxe/tables.h>
+#include <ipxe/dhcp.h>
 
 /** @file
  *
@@ -100,4 +100,4 @@ struct feature {
 #define FEATURE_VERSION( ... )						    \
 	DHCP_FEATURE ( DHCP_ENCAPSULATED ( DHCP_EB_VERSION ), __VA_ARGS__ )
 
-#endif /* _GPXE_FEATURES_H */
+#endif /* _IPXE_FEATURES_H */

src/include/ipxe/filter.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_FILTER_H
-#define _GPXE_FILTER_H
+#ifndef _IPXE_FILTER_H
+#define _IPXE_FILTER_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
-#include <gpxe/xfer.h>
+#include <ipxe/xfer.h>
 
 /**
  * Half of a data transfer filter
@@ -72,4 +72,4 @@ static inline void filter_init ( struct xfer_filter_half *left,
 	right->other = left;
 }
 
-#endif /* _GPXE_FILTER_H */
+#endif /* _IPXE_FILTER_H */

src/include/ipxe/ftp.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_FTP_H
-#define _GPXE_FTP_H
+#ifndef _IPXE_FTP_H
+#define _IPXE_FTP_H
 
 /** @file
  *
@@ -12,4 +12,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 /** FTP default port */
 #define FTP_PORT 21
 
-#endif /* _GPXE_FTP_H */
+#endif /* _IPXE_FTP_H */

src/include/ipxe/gdbserial.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_GDBSERIAL_H
-#define _GPXE_GDBSERIAL_H
+#ifndef _IPXE_GDBSERIAL_H
+#define _IPXE_GDBSERIAL_H
 
 /** @file
  *
@@ -18,4 +18,4 @@ struct gdb_transport;
  */
 struct gdb_transport *gdbserial_configure ( void );
 
-#endif /* _GPXE_GDBSERIAL_H */
+#endif /* _IPXE_GDBSERIAL_H */

src/include/ipxe/gdbstub.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_GDBSTUB_H
-#define _GPXE_GDBSTUB_H
+#ifndef _IPXE_GDBSTUB_H
+#define _IPXE_GDBSTUB_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/tables.h>
+#include <ipxe/tables.h>
 #include <gdbmach.h>
 
 /**
@@ -74,4 +74,4 @@ extern void gdbstub_start ( struct gdb_transport *trans );
  **/
 extern void gdbstub_handler ( int signo, gdbreg_t *regs );
 
-#endif /* _GPXE_GDBSTUB_H */
+#endif /* _IPXE_GDBSTUB_H */

src/include/ipxe/gdbudp.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_GDBUDP_H
-#define _GPXE_GDBUDP_H
+#ifndef _IPXE_GDBUDP_H
+#define _IPXE_GDBUDP_H
 
 /** @file
  *
@@ -21,4 +21,4 @@ struct gdb_transport;
  */
 struct gdb_transport *gdbudp_configure ( const char *name, struct sockaddr_in *addr );
 
-#endif /* _GPXE_GDBUDP_H */
+#endif /* _IPXE_GDBUDP_H */

src/include/ipxe/hidemem.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_HIDEMEM_H
-#define _GPXE_HIDEMEM_H
+#ifndef _IPXE_HIDEMEM_H
+#define _IPXE_HIDEMEM_H
 
 /**
  * @file
@@ -14,4 +14,4 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 extern void hide_umalloc ( physaddr_t start, physaddr_t end );
 
-#endif /* _GPXE_HIDEMEM_H */
+#endif /* _IPXE_HIDEMEM_H */

src/include/ipxe/hmac.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_HMAC_H
-#define _GPXE_HMAC_H
+#ifndef _IPXE_HMAC_H
+#define _IPXE_HMAC_H
 
 /** @file
  *
@@ -8,7 +8,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/crypto.h>
+#include <ipxe/crypto.h>
 
 /**
  * Update HMAC
@@ -29,4 +29,4 @@ extern void hmac_init ( struct digest_algorithm *digest, void *digest_ctx,
 extern void hmac_final ( struct digest_algorithm *digest, void *digest_ctx,
 			 void *key, size_t *key_len, void *hmac );
 
-#endif /* _GPXE_HMAC_H */
+#endif /* _IPXE_HMAC_H */

src/include/ipxe/http.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_HTTP_H
-#define _GPXE_HTTP_H
+#ifndef _IPXE_HTTP_H
+#define _IPXE_HTTP_H
 
 /** @file
  *
@@ -20,4 +20,4 @@ extern int http_open_filter ( struct xfer_interface *xfer, struct uri *uri,
 			      int ( * filter ) ( struct xfer_interface *,
 						 struct xfer_interface ** ) );
 
-#endif /* _GPXE_HTTP_H */
+#endif /* _IPXE_HTTP_H */

src/include/ipxe/i2c.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_I2C_H
-#define _GPXE_I2C_H
+#ifndef _IPXE_I2C_H
+#define _IPXE_I2C_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/bitbash.h>
+#include <ipxe/bitbash.h>
 
 /** An I2C device
  *
@@ -168,4 +168,4 @@ init_at24c11 ( struct i2c_device *i2cdev ) {
 	i2cdev->word_addr_len = 0;
 }
 
-#endif /* _GPXE_I2C_H */
+#endif /* _IPXE_I2C_H */

src/include/ipxe/ib_cm.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_CM_H
-#define _GPXE_IB_CM_H
+#ifndef _IPXE_IB_CM_H
+#define _IPXE_IB_CM_H
 
 /** @file
  *
@@ -9,8 +9,8 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/infiniband.h>
-#include <gpxe/retry.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/retry.h>
 
 struct ib_mad_transaction;
 struct ib_connection;
@@ -69,4 +69,4 @@ extern void ib_destroy_conn ( struct ib_device *ibdev,
 			      struct ib_queue_pair *qp,
 			      struct ib_connection *conn );
 
-#endif /* _GPXE_IB_CM_H */
+#endif /* _IPXE_IB_CM_H */

src/include/ipxe/ib_cmrc.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_CMRC_H
-#define _GPXE_IB_CMRC_H
+#ifndef _IPXE_IB_CMRC_H
+#define _IPXE_IB_CMRC_H
 
 /** @file
  *
@@ -9,12 +9,12 @@
 
 FILE_LICENCE ( BSD2 );
 
-#include <gpxe/infiniband.h>
-#include <gpxe/xfer.h>
+#include <ipxe/infiniband.h>
+#include <ipxe/xfer.h>
 
 extern int ib_cmrc_open ( struct xfer_interface *xfer,
 			  struct ib_device *ibdev,
 			  struct ib_gid *dgid,
 			  struct ib_gid_half *service_id );
 
-#endif /* _GPXE_IB_CMRC_H */
+#endif /* _IPXE_IB_CMRC_H */

src/include/ipxe/ib_mad.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_MAD_H
-#define _GPXE_IB_MAD_H
+#ifndef _IPXE_IB_MAD_H
+#define _IPXE_IB_MAD_H
 
 /** @file
  *
@@ -10,7 +10,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/ib_packet.h>
+#include <ipxe/ib_packet.h>
 
 /*****************************************************************************
  *
@@ -558,4 +558,4 @@ union ib_mad {
 	uint8_t bytes[256];
 } __attribute__ (( packed ));
 
-#endif /* _GPXE_IB_MAD_H */
+#endif /* _IPXE_IB_MAD_H */

src/include/ipxe/ib_mcast.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_MCAST_H
-#define _GPXE_IB_MCAST_H
+#ifndef _IPXE_IB_MCAST_H
+#define _IPXE_IB_MCAST_H
 
 /** @file
  *
@@ -9,7 +9,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/infiniband.h>
+#include <ipxe/infiniband.h>
 
 struct ib_mad_transaction;
 
@@ -45,4 +45,4 @@ extern int ib_mcast_join ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 extern void ib_mcast_leave ( struct ib_device *ibdev, struct ib_queue_pair *qp,
 			     struct ib_mc_membership *membership );
 
-#endif /* _GPXE_IB_MCAST_H */
+#endif /* _IPXE_IB_MCAST_H */

src/include/ipxe/ib_mi.h

@@ -1,5 +1,5 @@
-#ifndef _GPXE_IB_MI_H
-#define _GPXE_IB_MI_H
+#ifndef _IPXE_IB_MI_H
+#define _IPXE_IB_MI_H
 
 /** @file
  *
@@ -9,10 +9,10 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/list.h>
-#include <gpxe/retry.h>
-#include <gpxe/tables.h>
-#include <gpxe/infiniband.h>
+#include <ipxe/list.h>
+#include <ipxe/retry.h>
+#include <ipxe/tables.h>
+#include <ipxe/infiniband.h>
 
 struct ib_mad_interface;
 struct ib_mad_transaction;
@@ -132,4 +132,4 @@ extern struct ib_mad_interface * ib_create_mi ( struct ib_device *ibdev,
 extern void ib_destroy_mi ( struct ib_device *ibdev,
 			    struct ib_mad_interface *mi );
 
-#endif /* _GPXE_IB_MI_H */
+#endif /* _IPXE_IB_MI_H */