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

COPYRIGHTS

+In general iPXE files are licensed under the GPL.  For historical
+reasons, individual files may contain their own licence declarations.
+Most builds of iPXE do not contain all iPXE code (in particular, most
+builds will include only one driver), and so the overall licence can
+vary depending on what target you are building.
 
-In general gPXE files are licensed under the GPL.  GPLed files are in
-general either from Linux or have been explicitly put under GPL by the
-authors.  The license for a file is usually documented at the top of
-the file.  
+The resultant applicable licence(s) for any particular build can be
+determined by using "make bin/xxxxxxx.yyy.licence"; for example:
 
-A few files are inherited from FreeBSD netboot and therefore can be
-used under BSD or GPL.  Documented in this file are some of the
-non-GPL'ed files.  If the internal documentation for a file disagrees
-with what is documented in this file, the internal documentation for
-the file shall be override this file.
-
-File					Copyright status
-
-src/core/misc.c				BSD
-src/drivers/net/3c509.c			BSD
-src/drivers/net/3c509.h			BSD
-src/drivers/net/3c595.c			BSD
-src/drivers/net/3c595.h			BSD
-src/drivers/net/3c90x.c			Open Source
-src/drivers/net/epic100.c		None
-src/drivers/net/epic100.h		None
-src/drivers/net/ns8390.c		BSD
-src/drivers/net/ns8390.h		BSD
-src/arch/i386/include/bits/string.h	None
+  make bin/rtl8139.rom.licence
 
+to determine the resultant licence(s) for the build bin/rtl8139.rom

LOG

-gPXE LOG file
-
-+ Development for gPXE was moved from SourceForge CVS to a git
-  repository on git.etherboot.org in the first half of the year 2007.
-
-+ The gitweb interface for gPXE is available at:
-
-    http://git.etherboot.org/?p=gpxe.git
-
-+ The gitweb interface largely obsoletes the LOG file that used to be
-  distributed with Etherboot.
-

README

-gPXE README File
+iPXE README File
 
-gPXE is an implementation of the PXE specification for network
-booting, with extensions to allow additional features such as booting
-via HTTP, iSCSI, and AoE.  
-
-In generally, gPXE is compatible with the industry-standard PXE
-specification, and also supports Etherboot .nbi file loading and some
-additional protocols and features.
-
-For more detailed information about gPXE, please visit our project
-website at: http://etherboot.org/
-
-BUILDING gPXE IMAGE FROM SOURCE
-
-If you don't want to install development tools, and have access to the
-Web, you can get gPXE and Etherboot ROM images made on demand from
-http://rom-o-matic.net/
-
-If you would like to compile gPXE images from source, here are some tips.
-
-We normally compile gPXE images on x86, 32-bit Linux machines. It is
-possible to also use x86-64 machines. We use gcc compiler options to
-create 32-bit output.
-
-It is important to have the necessary software  packages installed.  A gcc-based
-toolchain is required.
-
-The following packages (at least) are required:
-
-  - a gcc tool chain (gcc 3.x or gcc 4.x)
-  - binutils
-  - perl
-  - syslinux
-  - mtools
-  
-To test your environment, cd to the "src" directory and type:
+Quick start guide:
 
+   cd src
    make
 
-You should see a lot of output, and when it stops, the "bin" directory
-should be populated with gPXE images and object files.
-
-To learn more about what to build and how to use gPXE, please visit our
-project website at http://etherboot.org/ , particularly the "howto" section.
-
-CONTACTING US
-
-Pointers to our project mailing lists are on http://etherboot.org/
-
-Real-time help is often available on IRC on the #etherboot channel of
-irc.freenode.net.
-
+For any more detailed instructions, see http://ipxe.org

contrib/errcode/README

-Error Code Lookup for gPXE
+Error Code Lookup for iPXE
 ==========================
-This program looks up gPXE error codes so you can locate the line of source
+This program looks up iPXE error codes so you can locate the line of source
 code which produced the error.
 
 Setup
 You must run:
 ./build_errcodedb.py >errcodedb.py
 
-This extracts error code definitions from the gPXE source code and produces a
+This extracts error code definitions from the iPXE source code and produces a
 "database" which is used by the main program.
 
 Once you have done this errcode.py and errcodedb.py are the only files you
-need.  They are now independent of the gPXE source code and can be moved
+need.  They are now independent of the iPXE source code and can be moved
 anywhere.
 
 [OPTIONAL]
 visible from your web server.
 
 [OPTIONAL]
-A simple IRC bot is provided.  Edit gpxebot.py to fill in the IRC details.
+A simple IRC bot is provided.  Edit ipxebot.py to fill in the IRC details.
 
 Usage
 -----

contrib/errcode/build_errcodedb.py

 import re
 
 pxenv_status_files = ('../../src/include/errno.h', )
-errfile_files = ('../../src/include/gpxe/errfile.h',
+errfile_files = ('../../src/include/ipxe/errfile.h',
             '../../src/arch/i386/include/bits/errfile.h')
 posix_errno_files = ('../../src/include/errno.h', )
 

contrib/errcode/errcode.php

 
 <html>
     <head>
-        <title>gPXE Error Code Lookup</title>
+        <title>iPXE Error Code Lookup</title>
         <style>
             body, pre, div, form, p, h2, b, tt {
                 padding: 0;
             <p>
             Firefox users can right-click on the <b>Error code</b>
             text box and select <b>Add a Keyword for this Search...</b>.
-            Set <b>name</b> to <tt>gPXE Error Code Lookup</tt> and
+            Set <b>name</b> to <tt>iPXE Error Code Lookup</tt> and
             <b>keyword</b> to <tt>gxpe</tt>  Then you can look up error
             codes by typing something like the following in your address
-            bar: <tt>gpxe 0x3c018003</tt>
+            bar: <tt>ipxe 0x3c018003</tt>
             <p>
         </div>
     </body>

contrib/errcode/errcodedb.py

+pxenv_status = {0: 'PXENV_STATUS_SUCCESS', 1: 'PXENV_STATUS_FAILURE', 2: 'PXENV_STATUS_BAD_FUNC', 3: 'PXENV_STATUS_UNSUPPORTED', 4: 'PXENV_STATUS_KEEP_UNDI', 5: 'PXENV_STATUS_KEEP_ALL', 6: 'PXENV_STATUS_OUT_OF_RESOURCES', 17: 'PXENV_STATUS_ARP_TIMEOUT', 107: 'PXENV_STATUS_UNDI_TRANSMIT_ERROR', 24: 'PXENV_STATUS_UDP_CLOSED', 25: 'PXENV_STATUS_UDP_OPEN', 26: 'PXENV_STATUS_TFTP_CLOSED', 27: 'PXENV_STATUS_TFTP_OPEN', 160: 'PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE', 161: 'PXENV_STATUS_BINL_NO_PXE_SERVER', 162: 'PXENV_STATUS_NOT_AVAILABLE_IN_PMODE', 163: 'PXENV_STATUS_NOT_AVAILABLE_IN_RMODE', 36: 'PXENV_STATUS_BIS_SHUTDOWN_FAILURE', 37: 'PXENV_STATUS_BIS_GBOA_FAILURE', 38: 'PXENV_STATUS_BIS_FREE_FAILURE', 48: 'PXENV_STATUS_TFTP_CANNOT_ARP_ADDRESS', 40: 'PXENV_STATUS_BIS_BAD_CKSUM', 176: 'PXENV_STATUS_BUSD_DEVICE_NOT_SUPPORTED', 50: 'PXENV_STATUS_TFTP_OPEN_TIMEOUT', 51: 'PXENV_STATUS_TFTP_UNKNOWN_OPCODE', 53: 'PXENV_STATUS_TFTP_READ_TIMEOUT', 54: 'PXENV_STATUS_TFTP_ERROR_OPCODE', 56: 'PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION', 57: 'PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION', 58: 'PXENV_STATUS_TFTP_TOO_MANY_PACKAGES', 59: 'PXENV_STATUS_TFTP_FILE_NOT_FOUND', 35: 'PXENV_STATUS_BIS_INIT_FAILURE', 61: 'PXENV_STATUS_TFTP_NO_MCAST_ADDRESS', 62: 'PXENV_STATUS_TFTP_NO_FILESIZE', 63: 'PXENV_STATUS_TFTP_INVALID_PACKET_SIZE', 192: 'PXENV_STATUS_LOADER_NO_FREE_BASE_MEMORY', 193: 'PXENV_STATUS_LOADER_NO_BC_ROMID', 194: 'PXENV_STATUS_LOADER_BAD_BC_ROMID', 195: 'PXENV_STATUS_LOADER_BAD_BC_RUNTIME_IMAGE', 196: 'PXENV_STATUS_LOADER_NO_UNDI_ROMID', 197: 'PXENV_STATUS_LOADER_BAD_UNDI_ROMID', 198: 'PXENV_STATUS_LOADER_BAD_UNDI_DRIVER_IMAGE', 32: 'PXENV_STATUS_MCOPY_PROBLEM', 200: 'PXENV_STATUS_LOADER_NO_PXE_STRUCT', 201: 'PXENV_STATUS_LOADER_NO_PXENV_STRUCT', 202: 'PXENV_STATUS_LOADER_UNDI_START', 203: 'PXENV_STATUS_LOADER_BC_START', 34: 'PXENV_STATUS_BIS_VALIDATE_FAILURE', 81: 'PXENV_STATUS_DHCP_TIMEOUT', 82: 'PXENV_STATUS_DHCP_NO_IP_ADDRESS', 83: 'PXENV_STATUS_DHCP_NO_BOOTFILE_NAME', 84: 'PXENV_STATUS_DHCP_BAD_IP_ADDRESS', 105: 'PXENV_STATUS_UNDI_ERROR_SETTING_ISR', 96: 'PXENV_STATUS_UNDI_INVALID_FUNCTION', 97: 'PXENV_STATUS_UNDI_MEDIATEST_FAILED', 98: 'PXENV_STATUS_UNDI_CANNOT_INIT_NIC_FOR_MCAST', 99: 'PXENV_STATUS_UNDI_CANNOT_INITIALIZE_NIC', 100: 'PXENV_STATUS_UNDI_CANNOT_INITIALIZE_PHY', 101: 'PXENV_STATUS_UNDI_CANNOT_READ_CONFIG_DATA', 102: 'PXENV_STATUS_UNDI_CANNOT_READ_INIT_DATA', 103: 'PXENV_STATUS_UNDI_BAD_MAC_ADDRESS', 104: 'PXENV_STATUS_UNDI_BAD_EEPROM_CHECKSUM', 60: 'PXENV_STATUS_TFTP_ACCESS_VIOLATION', 106: 'PXENV_STATUS_UNDI_INVALID_STATE', 39: 'PXENV_STATUS_BIS_GSI_FAILURE', 108: 'PXENV_STATUS_UNDI_INVALID_PARAMETER', 116: 'PXENV_STATUS_BSTRAP_PROMPT_MENU', 118: 'PXENV_STATUS_BSTRAP_MCAST_ADDR', 119: 'PXENV_STATUS_BSTRAP_MISSING_LIST', 120: 'PXENV_STATUS_BSTRAP_NO_RESPONSE', 121: 'PXENV_STATUS_BSTRAP_FILE_TOO_BIG', 33: 'PXENV_STATUS_BIS_INTEGRITY_FAILURE'}
+errfile = {1024: 'ERRFILE_ARCH', 1: 'ERRFILE_CORE', 1026: 'ERRFILE_timer_rdtsc', 3: 'ERRFILE_NET', 4: 'ERRFILE_IMAGE', 1025: 'ERRFILE_memtop_umalloc', 9: 'ERRFILE_downloader', 1034: 'ERRFILE_timer_bios', 11: 'ERRFILE_arp', 12: 'ERRFILE_elf', 2: 'ERRFILE_eisa', 15: 'ERRFILE_chap', 1041: 'ERRFILE_pnpbios', 18: 'ERRFILE_isapnp', 1043: 'ERRFILE_undinet', 20: 'ERRFILE_script', 17: 'ERRFILE_exec', 23: 'ERRFILE_aoeboot', 1049: 'ERRFILE_bios_smbios', 538: 'ERRFILE_tulip', 27: 'ERRFILE_ethernet', 28: 'ERRFILE_segment', 410: 'ERRFILE_amd8111e', 31: 'ERRFILE_autoboot', 33: 'ERRFILE_iobuf', 546: 'ERRFILE_via_rhine', 1059: 'ERRFILE_undirom', 36: 'ERRFILE_efi_image', 39: 'ERRFILE_dhcpmgmt', 1065: 'ERRFILE_int13', 554: 'ERRFILE_via_velocity', 43: 'ERRFILE_ipv4', 44: 'ERRFILE_embedded', 47: 'ERRFILE_imgmgmt', 49: 'ERRFILE_linebuf', 562: 'ERRFILE_w89c840', 51: 'ERRFILE_ipv6', 1076: 'ERRFILE_elfboot', 55: 'ERRFILE_pxe_tftp', 57: 'ERRFILE_monojob', 570: 'ERRFILE_ipoib', 59: 'ERRFILE_ndp', 1084: 'ERRFILE_comboot', 522: 'ERRFILE_sundance', 63: 'ERRFILE_pxe_udp', 19: 'ERRFILE_dhcpopts', 65: 'ERRFILE_nvo', 578: 'ERRFILE_e1000', 67: 'ERRFILE_netdevice', 1092: 'ERRFILE_com32', 71: 'ERRFILE_axtls_aes', 1036: 'ERRFILE_bzimage', 586: 'ERRFILE_e1000_hw', 75: 'ERRFILE_nullnet', 1100: 'ERRFILE_comboot_resolv', 906: 'ERRFILE_arbel', 79: 'ERRFILE_cipher', 81: 'ERRFILE_posix_io', 594: 'ERRFILE_mtnic', 83: 'ERRFILE_tcp', 1108: 'ERRFILE_comboot_call', 87: 'ERRFILE_image_cmd', 89: 'ERRFILE_resolv', 602: 'ERRFILE_phantom', 91: 'ERRFILE_ftp', 95: 'ERRFILE_uri_test', 97: 'ERRFILE_settings', 610: 'ERRFILE_ne2k_isa', 99: 'ERRFILE_http', 103: 'ERRFILE_ibft', 105: 'ERRFILE_vsprintf', 618: 'ERRFILE_b44', 107: 'ERRFILE_iscsi', 530: 'ERRFILE_tlan', 111: 'ERRFILE_tls', 113: 'ERRFILE_xfer', 626: 'ERRFILE_rtl818x', 115: 'ERRFILE_tcpip', 119: 'ERRFILE_ifmgmt', 121: 'ERRFILE_bitmap', 634: 'ERRFILE_sky2', 123: 'ERRFILE_udp', 1044: 'ERRFILE_eltorito', 127: 'ERRFILE_iscsiboot', 1027: 'ERRFILE_undi', 642: 'ERRFILE_ath5k', 131: 'ERRFILE_dhcp', 135: 'ERRFILE_efi_pci', 650: 'ERRFILE_atl1e', 139: 'ERRFILE_dns', 143: 'ERRFILE_efi_snp', 146: 'ERRFILE_i2c_bit', 147: 'ERRFILE_tftp', 151: 'ERRFILE_smbios', 154: 'ERRFILE_spi_bit', 155: 'ERRFILE_infiniband', 26: 'ERRFILE_mca', 1028: 'ERRFILE_bootsector', 159: 'ERRFILE_smbios_settings', 674: 'ERRFILE_skge', 1051: 'ERRFILE_undionly', 167: 'ERRFILE_efi_smbios', 1052: 'ERRFILE_multiboot', 171: 'ERRFILE_dhcppkt', 175: 'ERRFILE_pxemenu', 179: 'ERRFILE_slam', 183: 'ERRFILE_x509', 187: 'ERRFILE_ib_sma', 191: 'ERRFILE_login_ui', 195: 'ERRFILE_ib_packet', 211: 'ERRFILE_ib_qset', 1057: 'ERRFILE_biosint', 203: 'ERRFILE_icmp', 34: 'ERRFILE_pci', 207: 'ERRFILE_iwmgmt', 35: 'ERRFILE_icmpv6', 898: 'ERRFILE_scsi', 7: 'ERRFILE_OTHER', 1060: 'ERRFILE_nbi', 219: 'ERRFILE_ib_gma', 227: 'ERRFILE_ib_pathrec', 235: 'ERRFILE_ib_mcast', 243: 'ERRFILE_ib_cm', 25: 'ERRFILE_hw', 41: 'ERRFILE_job', 251: 'ERRFILE_net80211', 258: 'ERRFILE_3c509', 259: 'ERRFILE_ib_mi', 1068: 'ERRFILE_pxe_image', 266: 'ERRFILE_bnx2', 267: 'ERRFILE_ib_cmrc', 130: 'ERRFILE_nvs', 274: 'ERRFILE_cs89x0', 275: 'ERRFILE_ib_srp', 282: 'ERRFILE_eepro', 283: 'ERRFILE_sec80211', 290: 'ERRFILE_etherfabric', 291: 'ERRFILE_wep', 1073: 'ERRFILE_pxeparent', 298: 'ERRFILE_legacy', 299: 'ERRFILE_eapol', 306: 'ERRFILE_natsemi', 10: 'ERRFILE_isa', 307: 'ERRFILE_wpa', 1033: 'ERRFILE_memmap', 658: 'ERRFILE_sis190', 314: 'ERRFILE_pnic', 315: 'ERRFILE_wpa_psk', 138: 'ERRFILE_spi', 322: 'ERRFILE_prism2_pci', 323: 'ERRFILE_wpa_tkip', 330: 'ERRFILE_prism2_plx', 331: 'ERRFILE_wpa_ccmp', 338: 'ERRFILE_rtl8139', 346: 'ERRFILE_smc9000', 199: 'ERRFILE_ib_srpboot', 354: 'ERRFILE_tg3', 362: 'ERRFILE_3c509_eisa', 402: 'ERRFILE_3c90x', 1035: 'ERRFILE_undiload', 370: 'ERRFILE_3c515', 378: 'ERRFILE_3c529', 386: 'ERRFILE_3c595', 394: 'ERRFILE_3c5x9', 914: 'ERRFILE_hermon', 922: 'ERRFILE_linda', 514: 'ERRFILE_sis900', 666: 'ERRFILE_myri10ge', 930: 'ERRFILE_ata', 938: 'ERRFILE_srp', 434: 'ERRFILE_dmfe', 73: 'ERRFILE_open', 450: 'ERRFILE_eepro100', 458: 'ERRFILE_epic100', 418: 'ERRFILE_davicom', 466: 'ERRFILE_forcedeth', 163: 'ERRFILE_netdev_settings', 474: 'ERRFILE_mtd80x', 482: 'ERRFILE_ns83820', 490: 'ERRFILE_ns8390', 498: 'ERRFILE_pcnet32', 506: 'ERRFILE_r8169', 426: 'ERRFILE_depca'}
+posix_errno = {0: 'ENOERR', 1: 'E2BIG', 2: 'EACCES', 3: 'EADDRINUSE', 4: 'EADDRNOTAVAIL', 5: 'EAFNOSUPPORT', 6: 'EAGAIN', 7: 'EALREADY', 8: 'EBADF', 9: 'EBADMSG', 10: 'EBUSY', 11: 'ECANCELED', 12: 'ECHILD', 13: 'ECONNABORTED', 14: 'ECONNREFUSED', 15: 'ECONNRESET', 16: 'EDEADLK', 17: 'EDESTADDRREQ', 18: 'EDOM', 19: 'EDQUOT', 20: 'EEXIST', 21: 'EFAULT', 22: 'EFBIG', 23: 'EHOSTUNREACH', 24: 'EIDRM', 25: 'EILSEQ', 26: 'EINPROGRESS', 27: 'EINTR', 28: 'EINVAL', 29: 'EIO', 30: 'EISCONN', 31: 'EISDIR', 32: 'ELOOP', 33: 'EMFILE', 34: 'EMLINK', 35: 'EMSGSIZE', 36: 'EMULTIHOP', 37: 'ENAMETOOLONG', 38: 'ENETDOWN', 39: 'ENETRESET', 40: 'ENETUNREACH', 41: 'ENFILE', 42: 'ENOBUFS', 43: 'ENODATA', 44: 'ENODEV', 45: 'ENOENT', 46: 'ENOEXEC', 47: 'ENOLCK', 48: 'ENOLINK', 49: 'ENOMEM', 50: 'ENOMSG', 51: 'ENOPROTOOPT', 52: 'ENOSPC', 53: 'ENOSR', 54: 'ENOSTR', 55: 'ENOSYS', 56: 'ENOTCONN', 57: 'ENOTDIR', 58: 'ENOTEMPTY', 59: 'ENOTSOCK', 60: 'ENOTSUP', 61: 'ENOTTY', 62: 'ENXIO', 63: 'EOPNOTSUPP', 64: 'EOVERFLOW', 65: 'EPERM', 66: 'EPIPE', 67: 'EPROTO', 68: 'EPROTONOSUPPORT', 69: 'EPROTOTYPE', 70: 'ERANGE', 71: 'EROFS', 72: 'ESPIPE', 73: 'ESRCH', 74: 'ESTALE', 75: 'ETIME', 76: 'ETIMEDOUT', 77: 'ETXTBSY', 78: 'EWOULDBLOCK', 79: 'EXDEV'}

contrib/errcode/gpxebot.py

 
 HOST = 'irc.freenode.net'
 PORT = 6667
-NICK = 'gpxebot'
+NICK = 'ipxebot'
 CHAN = '#etherboot'
 NICKSERV_PASSWORD = None
-IDENT = 'gpxebot'
-REALNAME = 'gPXE bot'
+IDENT = 'ipxebot'
+REALNAME = 'iPXE bot'
 
 ERRCODE_RE = re.compile(r'(errcode|Error)\s+((0x)?[0-9a-fA-F]{8})')
 
         except ValueError:
             pass
     if msg.find('help') > -1:
-        pmsg(replyto, 'I look up gPXE error codes.  Message me like this:')
+        pmsg(replyto, 'I look up iPXE error codes.  Message me like this:')
         pmsg(replyto, 'errcode 0x12345678  OR  Error 0x12345678')
 
 def add_handler(command, handler, nargs):

contrib/rom-o-matic/README

-ROM-o-matic web interface for building gPXE ROMs
+ROM-o-matic web interface for building iPXE ROMs
 ------------------------------------------------
 
-This web application generates gPXE images and sends them to a web
+This web application generates iPXE images and sends them to a web
 browser.
 
-Available as part of the gPXE source code distribution, which can be
+Available as part of the iPXE source code distribution, which can be
 downlaoded from http://etherboot.org/
 
 Author:  Marty Connor <mdc@etherboot.org>
 License: GPLv2
-Support: http://etherboot.org/mailman/listinfo/gpxe
-         Please send support questions to the gPXE mailing list
+Support: http://etherboot.org/mailman/listinfo/ipxe
+         Please send support questions to the iPXE mailing list
 
 System Requirements
 -------------------
 - Apache web server
 - PHP 4+
-- Tools required to build gPXE installed on the server
+- Tools required to build iPXE installed on the server
   - gcc, mtools, syslinux, perl, etc.
 
 Setup
 -----
 As distributed, it is expected that the rom-o-matic source code
-directory is in the contrib directory of a gPXE source distribution.
+directory is in the contrib directory of a iPXE source distribution.
 
-The easiest way to do this is to simply put a gPXE source distribution
+The easiest way to do this is to simply put a iPXE source distribution
 in a web server accessible directory.
 
 If this is not the case, you will need to either edit the file
 $src_dir = "../../src";
 ?>
 
-Then change the line beginning "$src_dir = " to the path of your gPXE
+Then change the line beginning "$src_dir = " to the path of your iPXE
 source code tree.
 
 To make build times shorter, before you run rom-o-matic for the first time
-you should cd to the gpxe "src" directory and enter the following
+you should cd to the ipxe "src" directory and enter the following
 commands:
 
   $ make
 --------------------------------------
 Enter a URL like:
 
-   http://example.com/gpxe-1.x.x/contrib/rom-o-matic
+   http://example.com/ipxe-1.x.x/contrib/rom-o-matic
 

contrib/rom-o-matic/bottom.php

 </h4>
 <ul>
   <li>
-    Source code for gPXE images is available at
+    Source code for iPXE images is available at
     <a href="http://etherboot.org/wiki/download" target="_blank">
     http://etherboot.org/wiki/download</a>
     <br><br>
   </li>
   <li>
-    For general information about using gPXE, please visit the
+    For general information about using iPXE, please visit the
     <a href="http://www.etherboot.org/" target="_blank">
     Etherboot Project Home Page</a>
     <br><br>
   </li>
   <li>
-    For Email-based support for gPXE please join
+    For Email-based support for iPXE please join
     <a href="http://etherboot.org/wiki/mailinglists" target="_blank">
     Etherboot Project mailing lists.</a>
     <br><br>
   </li>
   <li>
-    For real-time online gPXE support via IRC please visit the
+    For real-time online iPXE support via IRC please visit the
     <a href="irc://irc.freenode.net/%23etherboot"> #etherboot channel
     of irc.freenode.net</a>.
     <br><br>

contrib/rom-o-matic/build.php

 $config_dir = $build_dir . "/config";
 
 // Write config files with supplied flags
-write_gpxe_config_files ( $config_dir, $flags );
+write_ipxe_config_files ( $config_dir, $flags );
 
 // Handle a possible embedded script
 $emb_script_cmd = "";
 $embedded_script = isset ( $_POST['embedded_script'] ) ? $_POST['embedded_script'] : "";
 if ( $embedded_script != "" ) {
-    $emb_script_path = "$build_dir" . "/script0.gpxe";
+    $emb_script_path = "$build_dir" . "/script0.ipxe";
 
-	if ( substr ( $embedded_script, 0, 5 ) != "#!gpxe" ) {
-		$embedded_script = "#!gpxe\n" . $embedded_script;
+	if ( substr ( $embedded_script, 0, 5 ) != "#!ipxe" ) {
+		$embedded_script = "#!ipxe\n" . $embedded_script;
 	}
 
-    // gPXE 0.9.7 doesn't like '\r\n" in the shebang...
+    // iPXE 0.9.7 doesn't like '\r\n" in the shebang...
     $embedded_script = str_replace ( "\r\n", "\n", $embedded_script );
 
     write_file_from_string ( $emb_script_path, $embedded_script );
             // Delete build directory as soon as it is not needed
             rm_build_dir ();
 
-            $output_filename = "gpxe-${version}-${nic}.${fmt_extension}";
+            $output_filename = "ipxe-${version}-${nic}.${fmt_extension}";
 
             // Try to force IE to handle downloading right.
             Header ( "Cache-control: private");

contrib/rom-o-matic/directions.php

           above.<br><br>
         </li>
         <li>
-          gPXE does not support all possible PCI IDs for supported
+          iPXE does not support all possible PCI IDs for supported
           NICs.
           <br><br>
         </li>

contrib/rom-o-matic/doc/IMAGE_SCRIPT.html

-gPXE script image support
+iPXE script image support

contrib/rom-o-matic/flag-table.php

 	   "flag" => "PRODUCT_SHORT_NAME",
 	   "hide_from_user" => "yes",
 	   "type" => "string",
-	   "value" => "gPXE",
+	   "value" => "iPXE",
 	   "cfgsec" => "general"
 	   ),
 

contrib/rom-o-matic/globals.php

  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-// Directory containing gPXE source code tree
+// Directory containing iPXE source code tree
 $src_dir = "../../src";
 
-// Compute gPXE version based on source tree
+// Compute iPXE version based on source tree
 exec ( "make -C '$src_dir' version 2>&1", $make_output, $status );
 $version = ( $status == 0 && count ( $make_output  ) > 1 )
            ? trim ( $make_output[count ( $make_output ) - 2] )
 $bottom_inc = "bottom.php";
 
 // Descriptive strings
-$header_title = "ROM-o-matic for gPXE $version";
-$html_tagline = "ROM-o-matic dynamically generates gPXE images";
-$html_title   = "ROM-o-matic for gPXE $version";
-$description  = "a dynamic gPXE image generator";
+$header_title = "ROM-o-matic for iPXE $version";
+$html_tagline = "ROM-o-matic dynamically generates iPXE images";
+$html_title   = "ROM-o-matic for iPXE $version";
+$description  = "a dynamic iPXE image generator";
 
 // For emacs:
 // Local variables:

contrib/rom-o-matic/top.php

 <html>
 <head>
   <link rev="made" href="mailto:<? echo "${webmaster_email}" ?>">
-  <meta name="keywords" content="rom, etherboot, gpxe, open source, rom-o-matic.net">
+  <meta name="keywords" content="rom, etherboot, ipxe, open source, rom-o-matic.net">
   <title><? echo $header_title ?></title>
   <meta name="description" content="<? echo $description ?>">
 </head>

contrib/rom-o-matic/utils.php

  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-// Include table of user-configurable gPXE options
+// Include table of user-configurable iPXE options
 require_once "flag-table.php";
 
 // Include user-shadowable globals
 /**
  * Extract NIC families and associated ROM PCI IDs from the src/bin/NIC file.
  *
- * $src_dir must contain the path of the gPXE src directory for this build
+ * $src_dir must contain the path of the iPXE src directory for this build
  *
  * @return array[0] array $new_nics
  * @return array[1] array $roms
 
     // add special cases to the top
 
-	$new_nics = array ( "all-drivers" => "gpxe",
+	$new_nics = array ( "all-drivers" => "ipxe",
 						"undionly" => "undionly",
 						"undi" => "undi",
     );
 }
 
 /**
- * Output given value in appropriate format for gPXE config file
+ * Output given value in appropriate format for iPXE config file
  *
- * gPXE config/*.h files use C pre-processor syntax.  Output the given
+ * iPXE config/*.h files use C pre-processor syntax.  Output the given
  * compile option in a format appropriate to its type
  *
  * @param string $key   index into $flag_table for given compile option
 
         } else {
 
-            // Flag (gPXE compile option) should be displayed to user
+            // Flag (iPXE compile option) should be displayed to user
 
             if ( $type == "header" ) {
 
 }
 
 /**
- * Write gPXE config files based on value of given flags
+ * Write iPXE config files based on value of given flags
  *
- * gPXE compile options are stored in src/config/*.h .
+ * iPXE compile options are stored in src/config/*.h .
  * We write out a config file for each set of options.
  *
  * @param string $config_dir directory to write .h files to
  *
  * @return void
  */
-function write_gpxe_config_files ( $config_dir, $flags )
+function write_ipxe_config_files ( $config_dir, $flags )
 {
     global $flag_table;
 

src/Makefile

 # Default build target: build the most common targets and print out a
 # helpfully suggestive message
 #
-all : bin/blib.a bin/gpxe.dsk bin/gpxe.iso bin/gpxe.usb bin/undionly.kpxe
+all : bin/blib.a bin/ipxe.dsk bin/ipxe.iso bin/ipxe.usb bin/undionly.kpxe
 	@$(ECHO) '==========================================================='
 	@$(ECHO)
 	@$(ECHO) 'To create a bootable floppy, type'
-	@$(ECHO) '    cat bin/gpxe.dsk > /dev/fd0'
+	@$(ECHO) '    cat bin/ipxe.dsk > /dev/fd0'
 	@$(ECHO) 'where /dev/fd0 is your floppy drive.  This will erase any'
 	@$(ECHO) 'data already on the disk.'
 	@$(ECHO)
 	@$(ECHO) 'To create a bootable USB key, type'
-	@$(ECHO) '    cat bin/gpxe.usb > /dev/sdX'
+	@$(ECHO) '    cat bin/ipxe.usb > /dev/sdX'
 	@$(ECHO) 'where /dev/sdX is your USB key, and is *not* a real hard'
 	@$(ECHO) 'disk on your system.  This will erase any data already on'
 	@$(ECHO) 'the USB key.'
 	@$(ECHO)
 	@$(ECHO) 'To create a bootable CD-ROM, burn the ISO image '
-	@$(ECHO) 'bin/gpxe.iso to a blank CD-ROM.'
+	@$(ECHO) 'bin/ipxe.iso to a blank CD-ROM.'
 	@$(ECHO)
 	@$(ECHO) 'These images contain drivers for all supported cards.  You'
 	@$(ECHO) 'can build more customised images, and ROM images, using'
 		   -DVERSION_MINOR=$(VERSION_MINOR) \
 		   -DVERSION_PATCH=$(VERSION_PATCH) \
 		   -DVERSION=\"$(VERSION)\"
-IDENT		= '$(@F) $(VERSION) (GPL) etherboot.org'
+IDENT		= '$(@F) $(VERSION) (GPL) ipxe.org'
 version :
 	@$(ECHO) $(VERSION)
 

src/Makefile.housekeeping

 # TGT_ROM_NAME : the ROM name (e.g. "dfe538")
 # TGT_MEDIA    : the media type (e.g. "rom")
 #
-DRIVERS_gpxe	= $(DRIVERS)
+DRIVERS_ipxe	= $(DRIVERS)
 CARD_DRIVER	= $(firstword $(DRIVER_$(1)) $(1))
 TGT_ELEMENTS	= $(subst --, ,$(firstword $(subst ., ,$(notdir $@))))
 TGT_PREFIX	= $(word 2,$(subst ., ,$(notdir $@)))
 allroms allzroms : all%s : $(foreach ROM,$(ROMS),$(BIN)/$(ROM).%)
 allpxes allisos alldsks : all%s : $(foreach DRIVER,$(DRIVERS),$(BIN)/$(DRIVER).%)
 
-# Alias for gpxe.%
+# Alias for ipxe.%
 #
-$(BIN)/etherboot.% : $(BIN)/gpxe.%
+$(BIN)/etherboot.% : $(BIN)/ipxe.%
 	ln -sf $(notdir $<) $@
 
 endif # defined(BIN)

src/arch/i386/core/gdbmach.c

 #include <stddef.h>
 #include <stdio.h>
 #include <assert.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/gdbstub.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/gdbstub.h>
 #include <gdbmach.h>
 
 /** @file

src/arch/i386/core/pic8259.c

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <pic8259.h>
 
 /** @file

src/arch/i386/core/rdtsc_timer.c

  */
 
 #include <assert.h>
-#include <gpxe/timer.h>
-#include <gpxe/timer2.h>
+#include <ipxe/timer.h>
+#include <ipxe/timer2.h>
 
 /**
  * Number of TSC ticks per microsecond

src/arch/i386/core/relocate.c

-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include <registers.h>
-#include <gpxe/memmap.h>
+#include <ipxe/memmap.h>
 
 /*
  * Originally by Eric Biederman

src/arch/i386/core/timer2.c

 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stddef.h>
-#include <gpxe/timer2.h>
-#include <gpxe/io.h>
+#include <ipxe/timer2.h>
+#include <ipxe/io.h>
 
 /* Timers tick over at this rate */
 #define TIMER2_TICKS_PER_SEC	1193180U

src/arch/i386/core/video_subr.c

 
 #include "stddef.h"
 #include "string.h"
-#include <gpxe/io.h>
+#include <ipxe/io.h>
 #include "console.h"
-#include <gpxe/init.h>
+#include <ipxe/init.h>
 #include "vga.h"
 
 struct console_driver vga_console;

src/arch/i386/core/x86_io.c

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/io.h>
-#include <gpxe/x86_io.h>
+#include <ipxe/io.h>
+#include <ipxe/x86_io.h>
 
 /** @file
  *
- * gPXE I/O API for x86
+ * iPXE I/O API for x86
  *
  */
 

src/arch/i386/drivers/net/undi.c

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <undi.h>
 #include <undirom.h>
 #include <undiload.h>

src/arch/i386/drivers/net/undiload.c

 #include <bios.h>
 #include <pnpbios.h>
 #include <basemem.h>
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <undi.h>
 #include <undirom.h>
 #include <undiload.h>

src/arch/i386/drivers/net/undinet.c

 #include <biosint.h>
 #include <pnpbios.h>
 #include <basemem_packet.h>
-#include <gpxe/io.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ethernet.h>
+#include <ipxe/io.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ethernet.h>
 #include <undi.h>
 #include <undinet.h>
 #include <pxeparent.h>

src/arch/i386/drivers/net/undionly.c

 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <gpxe/device.h>
-#include <gpxe/init.h>
+#include <ipxe/device.h>
+#include <ipxe/init.h>
 #include <undi.h>
 #include <undinet.h>
 #include <undipreload.h>

src/arch/i386/firmware/pcbios/basemem.c

 #include <realmode.h>
 #include <bios.h>
 #include <basemem.h>
-#include <gpxe/hidemem.h>
+#include <ipxe/hidemem.h>
 
 /** @file
  *

src/arch/i386/firmware/pcbios/bios_console.c

 #include <assert.h>
 #include <realmode.h>
 #include <console.h>
-#include <gpxe/ansiesc.h>
+#include <ipxe/ansiesc.h>
 
 #define ATTR_BOLD		0x08
 

src/arch/i386/firmware/pcbios/gateA20.c

 #include <stdio.h>
 #include <realmode.h>
 #include <bios.h>
-#include <gpxe/io.h>
-#include <gpxe/timer.h>
+#include <ipxe/io.h>
+#include <ipxe/timer.h>
 
 #define K_RDWR		0x60		/* keyboard data & cmds (read/write) */
 #define K_STATUS	0x64		/* keyboard status */

src/arch/i386/firmware/pcbios/hidemem.c

 #include <biosint.h>
 #include <basemem.h>
 #include <fakee820.h>
-#include <gpxe/init.h>
-#include <gpxe/memmap.h>
-#include <gpxe/hidemem.h>
+#include <ipxe/init.h>
+#include <ipxe/memmap.h>
+#include <ipxe/hidemem.h>
 
 /** Set to true if you want to test a fake E820 map */
 #define FAKE_E820 0
 #define ALIGN_HIDDEN 4096   /* 4kB page alignment should be enough */
 
 /**
- * A hidden region of gPXE
+ * A hidden region of iPXE
  *
  * This represents a region that will be edited out of the system's
  * memory map.
 	unsigned int fbms;
 
 	/* Dump memory map before mangling */
-	DBG ( "Hiding gPXE from system memory map\n" );
+	DBG ( "Hiding iPXE from system memory map\n" );
 	get_memmap ( &memmap );
 
 	/* Hook in fake E820 map, if we're testing one */
 			      &int15_vector );
 
 	/* Dump memory map after mangling */
-	DBG ( "Hidden gPXE from system memory map\n" );
+	DBG ( "Hidden iPXE from system memory map\n" );
 	get_memmap ( &memmap );
 }
 

src/arch/i386/firmware/pcbios/memmap.c

 #include <realmode.h>
 #include <bios.h>
 #include <memsizes.h>
-#include <gpxe/memmap.h>
+#include <ipxe/memmap.h>
 
 /**
  * @file

src/arch/i386/hci/commands/pxe_cmd.c

-#include <gpxe/netdevice.h>
-#include <gpxe/command.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/command.h>
 #include <hci/ifmgmt_cmd.h>
 #include <pxe_call.h>
 

src/arch/i386/image/bzimage.c

 #include <assert.h>
 #include <realmode.h>
 #include <bzimage.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/init.h>
-#include <gpxe/cpio.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/init.h>
+#include <ipxe/cpio.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "bzImage", DHCP_EB_FEATURE_BZIMAGE, 1 );
 
 
 	/* Set loader type */
 	if ( bzimg->version >= 0x0200 )
-		bzimg->bzhdr.type_of_loader = BZI_LOADER_TYPE_GPXE;
+		bzimg->bzhdr.type_of_loader = BZI_LOADER_TYPE_IPXE;
 
 	/* Set heap end pointer */
 	if ( bzimg->version >= 0x0201 ) {

src/arch/i386/image/com32.c

 #include <realmode.h>
 #include <basemem.h>
 #include <comboot.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/init.h>
-#include <gpxe/memmap.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/init.h>
+#include <ipxe/memmap.h>
 
 struct image_type com32_image_type __image_type ( PROBE_NORMAL );
 

src/arch/i386/image/comboot.c

 #include <realmode.h>
 #include <basemem.h>
 #include <comboot.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/init.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/init.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "COMBOOT", DHCP_EB_FEATURE_COMBOOT, 1 );
 

src/arch/i386/image/elfboot.c

 
 #include <errno.h>
 #include <elf.h>
-#include <gpxe/image.h>
-#include <gpxe/elf.h>
-#include <gpxe/features.h>
-#include <gpxe/init.h>
+#include <ipxe/image.h>
+#include <ipxe/elf.h>
+#include <ipxe/features.h>
+#include <ipxe/init.h>
 
 /**
  * @file

src/arch/i386/image/eltorito.c

 #include <realmode.h>
 #include <bootsector.h>
 #include <int13.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/ramdisk.h>
-#include <gpxe/init.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/ramdisk.h>
+#include <ipxe/init.h>
 
 #define ISO9660_BLKSIZE 2048
 #define ELTORITO_VOL_DESC_OFFSET ( 17 * ISO9660_BLKSIZE )

src/arch/i386/image/multiboot.c

 #include <assert.h>
 #include <realmode.h>
 #include <multiboot.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/memmap.h>
-#include <gpxe/elf.h>
-#include <gpxe/init.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/memmap.h>
+#include <ipxe/elf.h>
+#include <ipxe/init.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "Multiboot", DHCP_EB_FEATURE_MULTIBOOT, 1 );
 
 #define mbinfo __use_data16 ( mbinfo )
 
 /** The multiboot bootloader name */
-static char __data16_array ( mb_bootloader_name, [] ) = "gPXE " VERSION;
+static char __data16_array ( mb_bootloader_name, [] ) = "iPXE " VERSION;
 #define mb_bootloader_name __use_data16 ( mb_bootloader_name )
 
 /** The multiboot memory map */

src/arch/i386/image/nbi.c

 #include <gateA20.h>
 #include <memsizes.h>
 #include <basemem_packet.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/segment.h>
-#include <gpxe/init.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/fakedhcp.h>
-#include <gpxe/image.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/segment.h>
+#include <ipxe/init.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/fakedhcp.h>
+#include <ipxe/image.h>
+#include <ipxe/features.h>
 
 /** @file
  *

src/arch/i386/image/pxe_image.c

 
 #include <pxe.h>
 #include <pxe_call.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/image.h>
-#include <gpxe/segment.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/image.h>
+#include <ipxe/segment.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/features.h>
 
 FEATURE ( FEATURE_IMAGE, "PXE", DHCP_EB_FEATURE_PXE, 1 );
 
 		return -ENOEXEC;
 
 	/* Rejecting zero-length images is also useful, since these
-	 * end up looking to the user like bugs in gPXE.
+	 * end up looking to the user like bugs in iPXE.
 	 */
 	if ( ! filesz )
 		return -ENOEXEC;

src/arch/i386/include/bits/io.h

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/x86_io.h>
+#include <ipxe/x86_io.h>
 
 #endif /* _BITS_IO_H */

src/arch/i386/include/bits/nap.h

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/bios_nap.h>
-#include <gpxe/efi/efix86_nap.h>
+#include <ipxe/bios_nap.h>
+#include <ipxe/efi/efix86_nap.h>
 
 #endif /* _BITS_MAP_H */

src/arch/i386/include/bits/smbios.h

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/bios_smbios.h>
+#include <ipxe/bios_smbios.h>
 
 #endif /* _BITS_SMBIOS_H */

src/arch/i386/include/bits/timer.h

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/bios_timer.h>
-#include <gpxe/rdtsc_timer.h>
+#include <ipxe/bios_timer.h>
+#include <ipxe/rdtsc_timer.h>
 
 #endif /* _BITS_TIMER_H */

src/arch/i386/include/bits/umalloc.h

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/memtop_umalloc.h>
+#include <ipxe/memtop_umalloc.h>
 
 #endif /* _BITS_UMALLOC_H */

src/arch/i386/include/bzimage.h

 /** bzImage boot loader identifier for Etherboot */
 #define BZI_LOADER_TYPE_ETHERBOOT 0x40
 
-/** bzImage boot loader identifier for gPXE
+/** bzImage boot loader identifier for iPXE
  *
  * We advertise ourselves as Etherboot version 6.
  */
-#define BZI_LOADER_TYPE_GPXE ( BZI_LOADER_TYPE_ETHERBOOT | 0x06 )
+#define BZI_LOADER_TYPE_IPXE ( BZI_LOADER_TYPE_ETHERBOOT | 0x06 )
 
 /** bzImage "load high" flag */
 #define BZI_LOAD_HIGH 0x01

src/arch/i386/include/comboot.h

 
 #include <stdint.h>
 #include <setjmp.h>
-#include <gpxe/in.h>
+#include <ipxe/in.h>
 
 /** Segment used for COMBOOT PSP and image */
 #define COMBOOT_PSP_SEG 0x07C0

src/arch/i386/include/int13.h

 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/list.h>
+#include <ipxe/list.h>
 #include <realmode.h>
 
 struct block_device;

src/arch/i386/include/gpxe/abft.h → src/arch/i386/include/ipxe/abft.h

-#ifndef _GPXE_ABFT_H
-#define _GPXE_ABFT_H
+#ifndef _IPXE_ABFT_H
+#define _IPXE_ABFT_H
 
 /** @file
  *
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/acpi.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/acpi.h>
+#include <ipxe/if_ether.h>
 
 /** AoE boot firmware table signature */
 #define ABFT_SIG "aBFT"
 
 extern void abft_fill_data ( struct aoe_session *aoe );
 
-#endif /* _GPXE_ABFT_H */
+#endif /* _IPXE_ABFT_H */

src/arch/i386/include/gpxe/bios_nap.h → src/arch/i386/include/ipxe/bios_nap.h

-#ifndef _GPXE_BIOS_NAP_H
-#define _GPXE_BIOS_NAP_H
+#ifndef _IPXE_BIOS_NAP_H
+#define _IPXE_BIOS_NAP_H
 
 /** @file
  *
 #define NAP_PREFIX_pcbios __pcbios_
 #endif
 
-#endif /* _GPXE_BIOS_NAP_H */
+#endif /* _IPXE_BIOS_NAP_H */

src/arch/i386/include/gpxe/bios_smbios.h → src/arch/i386/include/ipxe/bios_smbios.h

-#ifndef _GPXE_BIOS_SMBIOS_H
-#define _GPXE_BIOS_SMBIOS_H
+#ifndef _IPXE_BIOS_SMBIOS_H
+#define _IPXE_BIOS_SMBIOS_H
 
 /** @file
  *
 #define SMBIOS_PREFIX_pcbios __pcbios_
 #endif
 
-#endif /* _GPXE_BIOS_SMBIOS_H */
+#endif /* _IPXE_BIOS_SMBIOS_H */

src/arch/i386/include/gpxe/bios_timer.h → src/arch/i386/include/ipxe/bios_timer.h

-#ifndef _GPXE_BIOS_TIMER_H
-#define _GPXE_BIOS_TIMER_H
+#ifndef _IPXE_BIOS_TIMER_H
+#define _IPXE_BIOS_TIMER_H
 
 /** @file
  *
 #define TIMER_PREFIX_pcbios __pcbios_
 #endif
 
-#include <gpxe/timer2.h>
+#include <ipxe/timer2.h>
 
 /**
  * Delay for a fixed number of microseconds
 	return 18;
 }
 
-#endif /* _GPXE_BIOS_TIMER_H */
+#endif /* _IPXE_BIOS_TIMER_H */

src/arch/i386/include/gpxe/ibft.h → src/arch/i386/include/ipxe/ibft.h

-#ifndef _GPXE_IBFT_H
-#define _GPXE_IBFT_H
+#ifndef _IPXE_IBFT_H
+#define _IPXE_IBFT_H
 
 /*
  * Copyright Fen Systems Ltd. 2007.  Portions of this code are derived
  */
 
 #include <stdint.h>
-#include <gpxe/acpi.h>
-#include <gpxe/in.h>
+#include <ipxe/acpi.h>
+#include <ipxe/in.h>
 
 /** iSCSI Boot Firmware Table signature */
 #define IBFT_SIG "iBFT"
 	unsigned int offset;
 };
 
-/** Amount of space reserved for strings in a gPXE iBFT */
+/** Amount of space reserved for strings in a iPXE iBFT */
 #define IBFT_STRINGS_SIZE 384
 
 /**
- * An iBFT created by gPXE
+ * An iBFT created by iPXE
  *
  */
-struct gpxe_ibft {
+struct ipxe_ibft {
 	/** The fixed section */
 	struct ibft_table table;
 	/** The Initiator section */
 extern int ibft_fill_data ( struct net_device *netdev,
 			    struct iscsi_session *iscsi );
 
-#endif /* _GPXE_IBFT_H */
+#endif /* _IPXE_IBFT_H */

src/arch/i386/include/gpxe/memtop_umalloc.h → src/arch/i386/include/ipxe/memtop_umalloc.h

-#ifndef _GPXE_MEMTOP_UMALLOC_H
-#define _GPXE_MEMTOP_UMALLOC_H
+#ifndef _IPXE_MEMTOP_UMALLOC_H
+#define _IPXE_MEMTOP_UMALLOC_H
 
 /** @file
  *
 #define UMALLOC_PREFIX_memtop __memtop_
 #endif
 
-#endif /* _GPXE_MEMTOP_UMALLOC_H */
+#endif /* _IPXE_MEMTOP_UMALLOC_H */

src/arch/i386/include/gpxe/rdtsc_timer.h → src/arch/i386/include/ipxe/rdtsc_timer.h

-#ifndef _GPXE_RDTSC_TIMER_H
-#define _GPXE_RDTSC_TIMER_H
+#ifndef _IPXE_RDTSC_TIMER_H
+#define _IPXE_RDTSC_TIMER_H
 
 /** @file
  *
 	return ticks;
 }
 
-#endif /* _GPXE_RDTSC_TIMER_H */
+#endif /* _IPXE_RDTSC_TIMER_H */

src/arch/i386/include/gpxe/sbft.h → src/arch/i386/include/ipxe/sbft.h

-#ifndef _GPXE_SBFT_H
-#define _GPXE_SBFT_H
+#ifndef _IPXE_SBFT_H
+#define _IPXE_SBFT_H
 
 /*
  * Copyright (C) 2009 Fen Systems Ltd <mbrown@fensystems.co.uk>.
  * The working draft specification for the SRP boot firmware table can
  * be found at
  *
- *   http://etherboot.org/wiki/srp/sbft
+ *   http://ipxe.org/wiki/srp/sbft
  *
  */
 
 #include <stdint.h>
-#include <gpxe/acpi.h>
-#include <gpxe/scsi.h>
-#include <gpxe/srp.h>
-#include <gpxe/ib_srp.h>
+#include <ipxe/acpi.h>
+#include <ipxe/scsi.h>
+#include <ipxe/srp.h>
+#include <ipxe/ib_srp.h>
 
 /** SRP Boot Firmware Table signature */
 #define SBFT_SIG "sBFT"
 } __attribute__ (( packed ));
 
 /**
- * An sBFT created by gPXE
+ * An sBFT created by iPXE
  */
-struct gpxe_sbft {
+struct ipxe_sbft {
 	/** The table header */
 	struct sbft_table table;
 	/** The SCSI subtable */
 
 extern int sbft_fill_data ( struct srp_device *srp );
 
-#endif /* _GPXE_SBFT_H */
+#endif /* _IPXE_SBFT_H */

src/arch/i386/include/gpxe/timer2.h → src/arch/i386/include/ipxe/timer2.h

-#ifndef _GPXE_TIMER2_H
-#define _GPXE_TIMER2_H
+#ifndef _IPXE_TIMER2_H
+#define _IPXE_TIMER2_H
 
 /** @file
  *
 
 extern void timer2_udelay ( unsigned long usecs );
 
-#endif /* _GPXE_TIMER2_H */
+#endif /* _IPXE_TIMER2_H */

src/arch/i386/include/gpxe/x86_io.h → src/arch/i386/include/ipxe/x86_io.h

-#ifndef _GPXE_X86_IO_H
-#define _GPXE_X86_IO_H
+#ifndef _IPXE_X86_IO_H
+#define _IPXE_X86_IO_H
 
 /** @file
  *
- * gPXE I/O API for x86
+ * iPXE I/O API for x86
  *
  * i386 uses direct pointer dereferences for accesses to memory-mapped
  * I/O space, and the inX/outX instructions for accesses to
 	__asm__ __volatile__ ( "lock; addl $0, 0(%%esp)" : : : "memory" );
 }
 
-#endif /* _GPXE_X86_IO_H */
+#endif /* _IPXE_X86_IO_H */

src/arch/i386/include/pxe.h

 
 #include "pxe_types.h"
 #include "pxe_api.h"
-#include <gpxe/device.h>
+#include <ipxe/device.h>
 
 /* Parameter block for pxenv_unknown() */
 struct s_PXENV_UNKNOWN {

src/arch/i386/include/realmode.h

 
 #include <stdint.h>
 #include <registers.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 /*
  * Data structures and type definitions

src/arch/i386/include/undi.h

 
 #ifndef ASSEMBLY
 
-#include <gpxe/device.h>
+#include <ipxe/device.h>
 #include <pxe_types.h>
 
 /** An UNDI device

src/arch/i386/interface/pcbios/abft.c

 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <realmode.h>
-#include <gpxe/aoe.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/abft.h>
+#include <ipxe/aoe.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/abft.h>
 
 /** @file
  *
  */
 
 #define abftab __use_data16 ( abftab )
-/** The aBFT used by gPXE */
+/** The aBFT used by iPXE */
 struct abft_table __data16 ( abftab ) __attribute__ (( aligned ( 16 ) )) = {
 	/* ACPI header */
 	.acpi = {
 		.length = sizeof ( abftab ),
 		.revision = 1,
 		.oem_id = "FENSYS",
-		.oem_table_id = "gPXE",
+		.oem_table_id = "iPXE",
 	},
 };
 

src/arch/i386/interface/pcbios/aoeboot.c

 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/aoe.h>
-#include <gpxe/ata.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/sanboot.h>
-#include <gpxe/abft.h>
+#include <ipxe/aoe.h>
+#include <ipxe/ata.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/sanboot.h>
+#include <ipxe/abft.h>
 #include <int13.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );

src/arch/i386/interface/pcbios/bios_nap.c

-#include <gpxe/nap.h>
+#include <ipxe/nap.h>
 #include <realmode.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );

src/arch/i386/interface/pcbios/bios_smbios.c

 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/smbios.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/smbios.h>
 #include <realmode.h>
 #include <pnpbios.h>
 

src/arch/i386/interface/pcbios/bios_timer.c

  *
  */
 
-#include <gpxe/timer.h>
+#include <ipxe/timer.h>
 #include <realmode.h>
 #include <bios.h>
 

src/arch/i386/interface/pcbios/ib_srpboot.c

 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/sanboot.h>
+#include <ipxe/sanboot.h>
 #include <int13.h>
-#include <gpxe/srp.h>
-#include <gpxe/sbft.h>
+#include <ipxe/srp.h>
+#include <ipxe/sbft.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 

src/arch/i386/interface/pcbios/ibft.c

 #include <errno.h>
 #include <byteswap.h>
 #include <realmode.h>
-#include <gpxe/pci.h>
-#include <gpxe/acpi.h>
-#include <gpxe/in.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ethernet.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/iscsi.h>
-#include <gpxe/ibft.h>
+#include <ipxe/pci.h>
+#include <ipxe/acpi.h>
+#include <ipxe/in.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ethernet.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/iscsi.h>
+#include <ipxe/ibft.h>
 
 /** @file
  *
  */
 
 #define ibftab __use_data16 ( ibftab )
-/** The iBFT used by gPXE */
-struct gpxe_ibft __data16 ( ibftab ) = {
+/** The iBFT used by iPXE */
+struct ipxe_ibft __data16 ( ibftab ) = {
 	/* Table header */
 	.table = {
 		/* ACPI header */
 			.length = sizeof ( ibftab ),
 			.revision = 1,
 			.oem_id = "FENSYS",
-			.oem_table_id = "gPXE",
+			.oem_table_id = "iPXE",
 		},
 		/* Control block */
 		.control = {

src/arch/i386/interface/pcbios/int13.c

 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <gpxe/list.h>
-#include <gpxe/blockdev.h>
-#include <gpxe/memmap.h>
+#include <ipxe/list.h>
+#include <ipxe/blockdev.h>
+#include <ipxe/memmap.h>
 #include <realmode.h>
 #include <bios.h>
 #include <biosint.h>

src/arch/i386/interface/pcbios/iscsiboot.c

 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <gpxe/iscsi.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/ibft.h>
-#include <gpxe/sanboot.h>
+#include <ipxe/iscsi.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/ibft.h>
+#include <ipxe/sanboot.h>
 #include <int13.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );

src/arch/i386/interface/pcbios/keepsan.c

 #include <stdint.h>
 #include <stdio.h>
-#include <gpxe/settings.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/init.h>
-#include <gpxe/sanboot.h>
+#include <ipxe/settings.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/init.h>
+#include <ipxe/sanboot.h>
 #include <usr/autoboot.h>
 
 struct setting keep_san_setting __setting = {

src/arch/i386/interface/pcbios/memtop_umalloc.c

 
 #include <limits.h>
 #include <errno.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/hidemem.h>
-#include <gpxe/memmap.h>
-#include <gpxe/umalloc.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/hidemem.h>
+#include <ipxe/memmap.h>
+#include <ipxe/umalloc.h>
 
 /** Alignment of external allocated memory */
 #define EM_ALIGN ( 4 * 1024 )

src/arch/i386/interface/pcbios/pcibios.c

 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
-#include <gpxe/pci.h>
+#include <ipxe/pci.h>
 #include <realmode.h>
 
 /** @file

src/arch/i386/interface/pcbios/sbft.c

 
 #include <assert.h>
 #include <realmode.h>
-#include <gpxe/srp.h>
-#include <gpxe/ib_srp.h>
-#include <gpxe/acpi.h>
-#include <gpxe/sbft.h>
+#include <ipxe/srp.h>
+#include <ipxe/ib_srp.h>
+#include <ipxe/acpi.h>
+#include <ipxe/sbft.h>
 
 #define sbftab __use_data16 ( sbftab )
-/** The sBFT used by gPXE */
-struct gpxe_sbft __data16 ( sbftab ) = {
+/** The sBFT used by iPXE */
+struct ipxe_sbft __data16 ( sbftab ) = {
 	/* Table header */
 	.table = {
 		/* ACPI header */
 			.length = sizeof ( sbftab ),
 			.revision = 1,
 			.oem_id = "FENSYS",
-			.oem_table_id = "gPXE",
+			.oem_table_id = "iPXE",
 		},
 		.scsi_offset = offsetof ( typeof ( sbftab ), scsi ),
 		.srp_offset = offsetof ( typeof ( sbftab ), srp ),

src/arch/i386/interface/pxe/pxe_call.c

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/uaccess.h>
-#include <gpxe/init.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/init.h>
 #include <registers.h>
 #include <biosint.h>
 #include <pxe.h>

src/arch/i386/interface/pxe/pxe_errors.c

 #include <errno.h>
-#include <gpxe/errortab.h>
+#include <ipxe/errortab.h>
 
 /*
  * This table was generated from the relevant section of errno.h using

src/arch/i386/interface/pxe/pxe_file.c

 #include <stdio.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/posix_io.h>
-#include <gpxe/features.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/posix_io.h>
+#include <ipxe/features.h>
 #include <pxe.h>
 #include <realmode.h>
 
  * @ret #PXENV_EXIT_FAILURE		Command was not executed successfully
  * @ret s_PXENV_FILE_API_CHECK::Status	PXE status code
  * @ret s_PXENV_FILE_API_CHECK::Magic	Outbound magic number (0xe9c17b20)
- * @ret s_PXENV_FILE_API_CHECK::Provider "gPXE" (0x45585067)
+ * @ret s_PXENV_FILE_API_CHECK::Provider "iPXE" (0x45585067)
  * @ret s_PXENV_FILE_API_CHECK::APIMask API function bitmask
  * @ret s_PXENV_FILE_API_CHECK::Flags	Reserved
  *
 		file_api_check->Status   = PXENV_STATUS_SUCCESS;
 		file_api_check->Size     = sizeof(struct s_PXENV_FILE_API_CHECK);
 		file_api_check->Magic    = 0xe9c17b20;
-		file_api_check->Provider = 0x45585067; /* "gPXE" */
+		file_api_check->Provider = 0x45585067; /* "iPXE" */
 		file_api_check->APIMask  = 0x0000007f; /* Functions e0-e6 */
 		/* Check to see if we have a PXE exit hook */
 		if ( pxe_exit_hook.segment | pxe_exit_hook.offset )

src/arch/i386/interface/pxe/pxe_loader.c

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/init.h>
+#include <ipxe/init.h>
 #include "pxe.h"
 #include "pxe_call.h"
 

src/arch/i386/interface/pxe/pxe_preboot.c

 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/fakedhcp.h>
-#include <gpxe/device.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/isapnp.h>
-#include <gpxe/init.h>
-#include <gpxe/if_ether.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/fakedhcp.h>
+#include <ipxe/device.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/isapnp.h>
+#include <ipxe/init.h>
+#include <ipxe/if_ether.h>
 #include <basemem_packet.h>
 #include <biosint.h>
 #include "pxe.h"

src/arch/i386/interface/pxe/pxe_tftp.c

 #include <stdio.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/in.h>
-#include <gpxe/tftp.h>
-#include <gpxe/xfer.h>
-#include <gpxe/open.h>
-#include <gpxe/process.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/in.h>
+#include <ipxe/tftp.h>
+#include <ipxe/xfer.h>
+#include <ipxe/open.h>
+#include <ipxe/process.h>
 #include <pxe.h>
 
 /** A PXE TFTP connection */

src/arch/i386/interface/pxe/pxe_udp.c

 
 #include <string.h>
 #include <byteswap.h>
-#include <gpxe/xfer.h>
-#include <gpxe/udp.h>
-#include <gpxe/uaccess.h>
-#include <gpxe/process.h>
+#include <ipxe/xfer.h>
+#include <ipxe/udp.h>
+#include <ipxe/uaccess.h>
+#include <ipxe/process.h>
 #include <pxe.h>
 
 /*

src/arch/i386/interface/pxe/pxe_undi.c

 #include <string.h>
 #include <byteswap.h>
 #include <basemem_packet.h>
-#include <gpxe/netdevice.h>
-#include <gpxe/iobuf.h>
-#include <gpxe/device.h>
-#include <gpxe/pci.h>
-#include <gpxe/if_ether.h>
-#include <gpxe/ip.h>
-#include <gpxe/arp.h>
-#include <gpxe/rarp.h>
+#include <ipxe/netdevice.h>
+#include <ipxe/iobuf.h>
+#include <ipxe/device.h>
+#include <ipxe/pci.h>
+#include <ipxe/if_ether.h>
+#include <ipxe/ip.h>
+#include <ipxe/arp.h>
+#include <ipxe/rarp.h>
 #include "pxe.h"
 
 /**

src/arch/i386/interface/pxeparent/pxeparent.c

 
 FILE_LICENCE ( GPL2_OR_LATER );
 
-#include <gpxe/dhcp.h>
+#include <ipxe/dhcp.h>
 #include <pxeparent.h>
 #include <pxe_api.h>
 #include <pxe_types.h>

src/arch/i386/interface/pxeparent/pxeparent_dhcp.c

 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <string.h>
-#include <gpxe/dhcp.h>
-#include <gpxe/netdevice.h>
+#include <ipxe/dhcp.h>
+#include <ipxe/netdevice.h>
 #include <undipreload.h>
 #include <pxeparent.h>
 #include <realmode.h>

src/arch/i386/interface/syslinux/com32_call.c

 #include <realmode.h>
 #include <comboot.h>
 #include <assert.h>
-#include <gpxe/uaccess.h>
+#include <ipxe/uaccess.h>
 
 static com32sys_t __bss16 ( com32_regs );
 #define com32_regs __use_data16 ( com32_regs )

src/arch/i386/interface/syslinux/com32_wrapper.S

 
 	.data
 
-/* Internal gPXE virtual address space %esp */
+/* Internal iPXE virtual address space %esp */
 .globl com32_internal_esp
 .lcomm com32_internal_esp, 4
 

src/arch/i386/interface/syslinux/comboot_call.c

 #include <pxe_call.h>
 #include <setjmp.h>
 #include <string.h>
-#include <gpxe/posix_io.h>
-#include <gpxe/process.h>
-#include <gpxe/serial.h>
-#include <gpxe/init.h>
-#include <gpxe/image.h>
+#include <ipxe/posix_io.h>
+#include <ipxe/process.h>
+#include <ipxe/serial.h>
+#include <ipxe/init.h>
+#include <ipxe/image.h>
 #include <usr/imgmgmt.h>
 #include "config/console.h"
 #include "config/serial.h"
 
 /** The "SYSLINUX" version string */
-static char __data16_array ( syslinux_version, [] ) = "\r\ngPXE " VERSION;
+static char __data16_array ( syslinux_version, [] ) = "\r\niPXE " VERSION;
 #define syslinux_version __use_data16 ( syslinux_version )
 
 /** The "SYSLINUX" copyright string */
-static char __data16_array ( syslinux_copyright, [] ) = " http://etherboot.org";
+static char __data16_array ( syslinux_copyright, [] ) = " http://ipxe.org";
 #define syslinux_copyright __use_data16 ( syslinux_copyright )
 
 static char __data16_array ( syslinux_configuration_file, [] ) = "";
 		ix86->regs.cl = 0; /* minor */
 
 		/* SYSLINUX derivative ID */
-		ix86->regs.dl = BZI_LOADER_TYPE_GPXE;
+		ix86->regs.dl = BZI_LOADER_TYPE_IPXE;
 
 		/* SYSLINUX version and copyright strings */
 		ix86->segs.es = rm_ds;
 				break;
 			}
 
-			/* This relies on the fact that a gPXE POSIX fd will
+			/* This relies on the fact that a iPXE POSIX fd will
 			 * always fit in 16 bits.
 			 */
 #if (POSIX_FD_MAX > 65535)
 
 	case 0x000A: /* Get Derivative-Specific Information */
 
-		/* gPXE has its own derivative ID, so there is no defined
+		/* iPXE has its own derivative ID, so there is no defined
 		 * output here; just return AL for now */
-		ix86->regs.al = BZI_LOADER_TYPE_GPXE;
+		ix86->regs.al = BZI_LOADER_TYPE_IPXE;
 		ix86->flags &= ~CF;
 		break;
 

src/arch/i386/interface/syslinux/comboot_resolv.c

 #include <errno.h>
 #include <comboot.h>
-#include <gpxe/in.h>
-#include <gpxe/list.h>
-#include <gpxe/process.h>
-#include <gpxe/resolv.h>
+#include <ipxe/in.h>
+#include <ipxe/list.h>
+#include <ipxe/process.h>
+#include <ipxe/resolv.h>
 
 FILE_LICENCE ( GPL2_OR_LATER );
 

src/arch/i386/prefix/dskprefix.S

 	.word 0xAA55
 
 start_runtime:
-	/* Install gPXE */
+	/* Install iPXE */
 	call	install
 
 	/* Set up real-mode stack */
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Boot next device */

src/arch/i386/prefix/hdprefix.S

 load_failed:
 	movw	$10f, %si
 	jmp	boot_error
-10:	.asciz	"Could not load gPXE\r\n"
+10:	.asciz	"Could not load iPXE\r\n"
 
 	.org 510
 	.byte 0x55, 0xaa
 
 start_image:
-	/* Install gPXE */
+	/* Install iPXE */
 	call	install
 
 	/* Set up real-mode stack */
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Boot next device */

src/arch/i386/prefix/lkrnprefix.S

 	 * in the prefix, it doesn't matter: we just have to ensure that
 	 * %cs:0000 is where the start of the image *would* be.
 	 */
-	ljmp	$(SYSSEG-(PREFIXSIZE/16)), $run_gpxe
+	ljmp	$(SYSSEG-(PREFIXSIZE/16)), $run_ipxe
 
 
 	.org	PREFIXSIZE
 /*
 	We're now at the beginning of the kernel proper.
  */
-run_gpxe:
+run_ipxe:
 	/* Set up stack just below 0x7c00 */
 	xorw	%ax, %ax
 	movw	%ax, %ss
 	movw	$0x7c00, %sp
 
-	/* Install gPXE */
+	/* Install iPXE */
 	call	install
 
 	/* Set up real-mode stack */
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Boot next device */

src/arch/i386/prefix/nbiprefix.S

  *****************************************************************************
  */
 entry:
-	/* Install gPXE */
+	/* Install iPXE */
 	call	install
 
 	/* Jump to .text16 segment */
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Reboot system */

src/arch/i386/prefix/pxeprefix.S

  *****************************************************************************
  */	
 finished:
-	jmp	run_gpxe
+	jmp	run_ipxe
 
 /*****************************************************************************
  * Subroutine: print segment:offset address
 	.equ undi_device_size, ( . - undi_device )
 
 /*****************************************************************************
- * Run gPXE main code
+ * Run iPXE main code
  *****************************************************************************
  */
 	.section ".prefix"
-run_gpxe:
-	/* Install gPXE */
+run_ipxe:
+	/* Install iPXE */
 	call	install
 
 	/* Set up real-mode stack */
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Restore PXE stack */

src/arch/i386/prefix/romprefix.S

 
 /* Manufacturer string */
 mfgstr:
-	.asciz	"http://etherboot.org"
+	.asciz	"http://ipxe.org"
 	.size mfgstr, . - mfgstr
 
 /* Product string
 	call	print_message
 	popf
 	jnz	out
-	/* Ctrl-B was pressed: invoke gPXE.  The keypress will be
+	/* Ctrl-B was pressed: invoke iPXE.  The keypress will be
 	 * picked up by the initial shell prompt, and we will drop
 	 * into a shell.
 	 */
  * strings PRODUCT_NAME and PRODUCT_SHORT_NAME in config/general.h.
  *
  * While nothing in the GPL prevents you from removing all references
- * to gPXE or http://etherboot.org, we prefer you not to do so.
+ * to iPXE or http://ipxe.org, we prefer you not to do so.
  *
  * If you have an OEM-mandated branding requirement that cannot be
  * satisfied simply by defining PRODUCT_NAME and PRODUCT_SHORT_NAME,
 	.ascii	"\n"
 	.ascii	PRODUCT_NAME
 	.ascii	"\n"
-	.asciz	"gPXE (http://etherboot.org) - "
+	.asciz	"iPXE (http://ipxe.org) - "
 	.size	init_message, . - init_message
 init_message_pci:
 	.asciz	" PCI"
 	call	print_message
 	popf
 	jz	1f
-	/* Leave keypress in buffer and start gPXE.  The keypress will
+	/* Leave keypress in buffer and start iPXE.  The keypress will
 	 * cause the usual initial Ctrl-B prompt to be skipped.
 	 */
 	pushw	%cs
 	movw	%ax, %ss
 	movw	$0x7c00, %sp
 
-	/* Install gPXE */
+	/* Install iPXE */
 	movl	image_source, %esi
 	movl	decompress_to, %edi
 	call	alloc_basemem
 	call	prot_call
 	popl	%ecx /* discard */
 
-	/* Uninstall gPXE */
+	/* Uninstall iPXE */
 	call	uninstall
 
 	/* Restore BIOS stack */