diff options
Diffstat (limited to 'src/arch')
88 files changed, 291 insertions, 291 deletions
diff --git a/src/arch/i386/core/gdbmach.c b/src/arch/i386/core/gdbmach.c index 97827ecb..396d340d 100644 --- a/src/arch/i386/core/gdbmach.c +++ b/src/arch/i386/core/gdbmach.c @@ -19,8 +19,8 @@ #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 diff --git a/src/arch/i386/core/pic8259.c b/src/arch/i386/core/pic8259.c index 1e2d23c5..0264c0c1 100644 --- a/src/arch/i386/core/pic8259.c +++ b/src/arch/i386/core/pic8259.c @@ -18,7 +18,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/io.h> +#include <ipxe/io.h> #include <pic8259.h> /** @file diff --git a/src/arch/i386/core/rdtsc_timer.c b/src/arch/i386/core/rdtsc_timer.c index 76679173..d2a8cc84 100644 --- a/src/arch/i386/core/rdtsc_timer.c +++ b/src/arch/i386/core/rdtsc_timer.c @@ -25,8 +25,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); */ #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 diff --git a/src/arch/i386/core/relocate.c b/src/arch/i386/core/relocate.c index 44e764fe..1dadb5fc 100644 --- a/src/arch/i386/core/relocate.c +++ b/src/arch/i386/core/relocate.c @@ -1,6 +1,6 @@ -#include <gpxe/io.h> +#include <ipxe/io.h> #include <registers.h> -#include <gpxe/memmap.h> +#include <ipxe/memmap.h> /* * Originally by Eric Biederman diff --git a/src/arch/i386/core/timer2.c b/src/arch/i386/core/timer2.c index 6e76b2eb..07786656 100644 --- a/src/arch/i386/core/timer2.c +++ b/src/arch/i386/core/timer2.c @@ -14,8 +14,8 @@ 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 diff --git a/src/arch/i386/core/video_subr.c b/src/arch/i386/core/video_subr.c index c821cd02..b10ef7bc 100644 --- a/src/arch/i386/core/video_subr.c +++ b/src/arch/i386/core/video_subr.c @@ -7,9 +7,9 @@ #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; diff --git a/src/arch/i386/core/x86_io.c b/src/arch/i386/core/x86_io.c index d2c363b9..2fba0680 100644 --- a/src/arch/i386/core/x86_io.c +++ b/src/arch/i386/core/x86_io.c @@ -18,12 +18,12 @@ 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 * */ diff --git a/src/arch/i386/drivers/net/undi.c b/src/arch/i386/drivers/net/undi.c index c6e253c0..71d8453a 100644 --- a/src/arch/i386/drivers/net/undi.c +++ b/src/arch/i386/drivers/net/undi.c @@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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> diff --git a/src/arch/i386/drivers/net/undiload.c b/src/arch/i386/drivers/net/undiload.c index 47a2baed..67ef00dd 100644 --- a/src/arch/i386/drivers/net/undiload.c +++ b/src/arch/i386/drivers/net/undiload.c @@ -26,7 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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> diff --git a/src/arch/i386/drivers/net/undinet.c b/src/arch/i386/drivers/net/undinet.c index 83b79e7f..7ec4b50a 100644 --- a/src/arch/i386/drivers/net/undinet.c +++ b/src/arch/i386/drivers/net/undinet.c @@ -25,11 +25,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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> diff --git a/src/arch/i386/drivers/net/undionly.c b/src/arch/i386/drivers/net/undionly.c index 7dfb5d15..ab9c61fb 100644 --- a/src/arch/i386/drivers/net/undionly.c +++ b/src/arch/i386/drivers/net/undionly.c @@ -21,8 +21,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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> diff --git a/src/arch/i386/firmware/pcbios/basemem.c b/src/arch/i386/firmware/pcbios/basemem.c index 1ba7d1f6..d18e8b80 100644 --- a/src/arch/i386/firmware/pcbios/basemem.c +++ b/src/arch/i386/firmware/pcbios/basemem.c @@ -22,7 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <realmode.h> #include <bios.h> #include <basemem.h> -#include <gpxe/hidemem.h> +#include <ipxe/hidemem.h> /** @file * diff --git a/src/arch/i386/firmware/pcbios/bios_console.c b/src/arch/i386/firmware/pcbios/bios_console.c index 1d18e54c..bf10ebcf 100644 --- a/src/arch/i386/firmware/pcbios/bios_console.c +++ b/src/arch/i386/firmware/pcbios/bios_console.c @@ -21,7 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <assert.h> #include <realmode.h> #include <console.h> -#include <gpxe/ansiesc.h> +#include <ipxe/ansiesc.h> #define ATTR_BOLD 0x08 diff --git a/src/arch/i386/firmware/pcbios/gateA20.c b/src/arch/i386/firmware/pcbios/gateA20.c index 1a71472d..55f72936 100644 --- a/src/arch/i386/firmware/pcbios/gateA20.c +++ b/src/arch/i386/firmware/pcbios/gateA20.c @@ -3,8 +3,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 */ diff --git a/src/arch/i386/firmware/pcbios/hidemem.c b/src/arch/i386/firmware/pcbios/hidemem.c index 17082c35..322be9e4 100644 --- a/src/arch/i386/firmware/pcbios/hidemem.c +++ b/src/arch/i386/firmware/pcbios/hidemem.c @@ -22,9 +22,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 @@ -33,7 +33,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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. @@ -138,7 +138,7 @@ static void hide_etherboot ( void ) { 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 */ @@ -178,7 +178,7 @@ static void hide_etherboot ( void ) { &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 ); } diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c index 8a30dbae..c53a35f5 100644 --- a/src/arch/i386/firmware/pcbios/memmap.c +++ b/src/arch/i386/firmware/pcbios/memmap.c @@ -23,7 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <realmode.h> #include <bios.h> #include <memsizes.h> -#include <gpxe/memmap.h> +#include <ipxe/memmap.h> /** * @file diff --git a/src/arch/i386/hci/commands/pxe_cmd.c b/src/arch/i386/hci/commands/pxe_cmd.c index 76c49bb9..6b4fa8fa 100644 --- a/src/arch/i386/hci/commands/pxe_cmd.c +++ b/src/arch/i386/hci/commands/pxe_cmd.c @@ -1,5 +1,5 @@ -#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> diff --git a/src/arch/i386/image/bzimage.c b/src/arch/i386/image/bzimage.c index 19450990..900e34e1 100644 --- a/src/arch/i386/image/bzimage.c +++ b/src/arch/i386/image/bzimage.c @@ -32,12 +32,12 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 ); @@ -201,7 +201,7 @@ static void bzimage_update_header ( struct image *image, /* 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 ) { diff --git a/src/arch/i386/image/com32.c b/src/arch/i386/image/com32.c index 6ab347c1..25a77e93 100644 --- a/src/arch/i386/image/com32.c +++ b/src/arch/i386/image/com32.c @@ -34,11 +34,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 ); diff --git a/src/arch/i386/image/comboot.c b/src/arch/i386/image/comboot.c index a00b2b95..253cbb69 100644 --- a/src/arch/i386/image/comboot.c +++ b/src/arch/i386/image/comboot.c @@ -34,11 +34,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 ); diff --git a/src/arch/i386/image/elfboot.c b/src/arch/i386/image/elfboot.c index a41040e8..7cb51bf9 100644 --- a/src/arch/i386/image/elfboot.c +++ b/src/arch/i386/image/elfboot.c @@ -20,10 +20,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 diff --git a/src/arch/i386/image/eltorito.c b/src/arch/i386/image/eltorito.c index 53eb2c02..a416d15b 100644 --- a/src/arch/i386/image/eltorito.c +++ b/src/arch/i386/image/eltorito.c @@ -31,11 +31,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 ) diff --git a/src/arch/i386/image/multiboot.c b/src/arch/i386/image/multiboot.c index 5b620956..b3c6b8f7 100644 --- a/src/arch/i386/image/multiboot.c +++ b/src/arch/i386/image/multiboot.c @@ -30,13 +30,13 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 ); @@ -242,7 +242,7 @@ static struct multiboot_info __bss16 ( mbinfo ); #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 */ diff --git a/src/arch/i386/image/nbi.c b/src/arch/i386/image/nbi.c index a4ee4420..68497365 100644 --- a/src/arch/i386/image/nbi.c +++ b/src/arch/i386/image/nbi.c @@ -4,13 +4,13 @@ #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 * diff --git a/src/arch/i386/image/pxe_image.c b/src/arch/i386/image/pxe_image.c index 63429f87..ef776d9a 100644 --- a/src/arch/i386/image/pxe_image.c +++ b/src/arch/i386/image/pxe_image.c @@ -27,11 +27,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 ); @@ -87,7 +87,7 @@ int pxe_load ( struct image *image ) { 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; diff --git a/src/arch/i386/include/bits/io.h b/src/arch/i386/include/bits/io.h index eded9778..f3ecf89b 100644 --- a/src/arch/i386/include/bits/io.h +++ b/src/arch/i386/include/bits/io.h @@ -9,6 +9,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/x86_io.h> +#include <ipxe/x86_io.h> #endif /* _BITS_IO_H */ diff --git a/src/arch/i386/include/bits/nap.h b/src/arch/i386/include/bits/nap.h index 1354f6bb..64066e6a 100644 --- a/src/arch/i386/include/bits/nap.h +++ b/src/arch/i386/include/bits/nap.h @@ -9,7 +9,7 @@ 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 */ diff --git a/src/arch/i386/include/bits/smbios.h b/src/arch/i386/include/bits/smbios.h index a68413aa..cc79eec5 100644 --- a/src/arch/i386/include/bits/smbios.h +++ b/src/arch/i386/include/bits/smbios.h @@ -9,6 +9,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/bios_smbios.h> +#include <ipxe/bios_smbios.h> #endif /* _BITS_SMBIOS_H */ diff --git a/src/arch/i386/include/bits/timer.h b/src/arch/i386/include/bits/timer.h index 32e6bd47..50b676b7 100644 --- a/src/arch/i386/include/bits/timer.h +++ b/src/arch/i386/include/bits/timer.h @@ -9,7 +9,7 @@ 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 */ diff --git a/src/arch/i386/include/bits/umalloc.h b/src/arch/i386/include/bits/umalloc.h index 17ba2cb2..54fb006f 100644 --- a/src/arch/i386/include/bits/umalloc.h +++ b/src/arch/i386/include/bits/umalloc.h @@ -9,6 +9,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/memtop_umalloc.h> +#include <ipxe/memtop_umalloc.h> #endif /* _BITS_UMALLOC_H */ diff --git a/src/arch/i386/include/bzimage.h b/src/arch/i386/include/bzimage.h index 42b31fe4..ccf8e353 100644 --- a/src/arch/i386/include/bzimage.h +++ b/src/arch/i386/include/bzimage.h @@ -86,11 +86,11 @@ struct bzimage_header { /** 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 diff --git a/src/arch/i386/include/comboot.h b/src/arch/i386/include/comboot.h index 1232f0a7..99ce79e2 100644 --- a/src/arch/i386/include/comboot.h +++ b/src/arch/i386/include/comboot.h @@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 diff --git a/src/arch/i386/include/int13.h b/src/arch/i386/include/int13.h index e1884d94..ed085d57 100644 --- a/src/arch/i386/include/int13.h +++ b/src/arch/i386/include/int13.h @@ -10,7 +10,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> -#include <gpxe/list.h> +#include <ipxe/list.h> #include <realmode.h> struct block_device; diff --git a/src/arch/i386/include/gpxe/abft.h b/src/arch/i386/include/ipxe/abft.h index 9065e61a..ca963020 100644 --- a/src/arch/i386/include/gpxe/abft.h +++ b/src/arch/i386/include/ipxe/abft.h @@ -1,5 +1,5 @@ -#ifndef _GPXE_ABFT_H -#define _GPXE_ABFT_H +#ifndef _IPXE_ABFT_H +#define _IPXE_ABFT_H /** @file * @@ -10,8 +10,8 @@ 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" @@ -34,4 +34,4 @@ struct abft_table { extern void abft_fill_data ( struct aoe_session *aoe ); -#endif /* _GPXE_ABFT_H */ +#endif /* _IPXE_ABFT_H */ diff --git a/src/arch/i386/include/gpxe/bios_nap.h b/src/arch/i386/include/ipxe/bios_nap.h index c32429b9..5b684c04 100644 --- a/src/arch/i386/include/gpxe/bios_nap.h +++ b/src/arch/i386/include/ipxe/bios_nap.h @@ -1,5 +1,5 @@ -#ifndef _GPXE_BIOS_NAP_H -#define _GPXE_BIOS_NAP_H +#ifndef _IPXE_BIOS_NAP_H +#define _IPXE_BIOS_NAP_H /** @file * @@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define NAP_PREFIX_pcbios __pcbios_ #endif -#endif /* _GPXE_BIOS_NAP_H */ +#endif /* _IPXE_BIOS_NAP_H */ diff --git a/src/arch/i386/include/gpxe/bios_smbios.h b/src/arch/i386/include/ipxe/bios_smbios.h index 83726b11..d8c7f648 100644 --- a/src/arch/i386/include/gpxe/bios_smbios.h +++ b/src/arch/i386/include/ipxe/bios_smbios.h @@ -1,5 +1,5 @@ -#ifndef _GPXE_BIOS_SMBIOS_H -#define _GPXE_BIOS_SMBIOS_H +#ifndef _IPXE_BIOS_SMBIOS_H +#define _IPXE_BIOS_SMBIOS_H /** @file * @@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define SMBIOS_PREFIX_pcbios __pcbios_ #endif -#endif /* _GPXE_BIOS_SMBIOS_H */ +#endif /* _IPXE_BIOS_SMBIOS_H */ diff --git a/src/arch/i386/include/gpxe/bios_timer.h b/src/arch/i386/include/ipxe/bios_timer.h index ed9df522..f9fc8041 100644 --- a/src/arch/i386/include/gpxe/bios_timer.h +++ b/src/arch/i386/include/ipxe/bios_timer.h @@ -1,5 +1,5 @@ -#ifndef _GPXE_BIOS_TIMER_H -#define _GPXE_BIOS_TIMER_H +#ifndef _IPXE_BIOS_TIMER_H +#define _IPXE_BIOS_TIMER_H /** @file * @@ -15,7 +15,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define TIMER_PREFIX_pcbios __pcbios_ #endif -#include <gpxe/timer2.h> +#include <ipxe/timer2.h> /** * Delay for a fixed number of microseconds @@ -41,4 +41,4 @@ TIMER_INLINE ( pcbios, ticks_per_sec ) ( void ) { return 18; } -#endif /* _GPXE_BIOS_TIMER_H */ +#endif /* _IPXE_BIOS_TIMER_H */ diff --git a/src/arch/i386/include/gpxe/ibft.h b/src/arch/i386/include/ipxe/ibft.h index c41e2e40..8525fe81 100644 --- a/src/arch/i386/include/gpxe/ibft.h +++ b/src/arch/i386/include/ipxe/ibft.h @@ -1,5 +1,5 @@ -#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 @@ -42,8 +42,8 @@ FILE_LICENCE ( BSD2 ); */ #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" @@ -273,14 +273,14 @@ struct ibft_string_block { 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 */ @@ -299,4 +299,4 @@ struct iscsi_session; extern int ibft_fill_data ( struct net_device *netdev, struct iscsi_session *iscsi ); -#endif /* _GPXE_IBFT_H */ +#endif /* _IPXE_IBFT_H */ diff --git a/src/arch/i386/include/gpxe/memtop_umalloc.h b/src/arch/i386/include/ipxe/memtop_umalloc.h index eaf7025b..001648fe 100644 --- a/src/arch/i386/include/gpxe/memtop_umalloc.h +++ b/src/arch/i386/include/ipxe/memtop_umalloc.h @@ -1,5 +1,5 @@ -#ifndef _GPXE_MEMTOP_UMALLOC_H -#define _GPXE_MEMTOP_UMALLOC_H +#ifndef _IPXE_MEMTOP_UMALLOC_H +#define _IPXE_MEMTOP_UMALLOC_H /** @file * @@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define UMALLOC_PREFIX_memtop __memtop_ #endif -#endif /* _GPXE_MEMTOP_UMALLOC_H */ +#endif /* _IPXE_MEMTOP_UMALLOC_H */ diff --git a/src/arch/i386/include/gpxe/rdtsc_timer.h b/src/arch/i386/include/ipxe/rdtsc_timer.h index 67ba22f0..472e1400 100644 --- a/src/arch/i386/include/gpxe/rdtsc_timer.h +++ b/src/arch/i386/include/ipxe/rdtsc_timer.h @@ -1,5 +1,5 @@ -#ifndef _GPXE_RDTSC_TIMER_H -#define _GPXE_RDTSC_TIMER_H +#ifndef _IPXE_RDTSC_TIMER_H +#define _IPXE_RDTSC_TIMER_H /** @file * @@ -36,4 +36,4 @@ TIMER_INLINE ( rdtsc, currticks ) ( void ) { return ticks; } -#endif /* _GPXE_RDTSC_TIMER_H */ +#endif /* _IPXE_RDTSC_TIMER_H */ diff --git a/src/arch/i386/include/gpxe/sbft.h b/src/arch/i386/include/ipxe/sbft.h index 30038436..f9910624 100644 --- a/src/arch/i386/include/gpxe/sbft.h +++ b/src/arch/i386/include/ipxe/sbft.h @@ -1,5 +1,5 @@ -#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>. @@ -40,15 +40,15 @@ FILE_LICENCE ( BSD2 ); * 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" @@ -105,9 +105,9 @@ struct sbft_ib_subtable { } __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 */ @@ -122,4 +122,4 @@ struct srp_device; extern int sbft_fill_data ( struct srp_device *srp ); -#endif /* _GPXE_SBFT_H */ +#endif /* _IPXE_SBFT_H */ diff --git a/src/arch/i386/include/gpxe/timer2.h b/src/arch/i386/include/ipxe/timer2.h index 8f119515..322a3ed5 100644 --- a/src/arch/i386/include/gpxe/timer2.h +++ b/src/arch/i386/include/ipxe/timer2.h @@ -1,5 +1,5 @@ -#ifndef _GPXE_TIMER2_H -#define _GPXE_TIMER2_H +#ifndef _IPXE_TIMER2_H +#define _IPXE_TIMER2_H /** @file * @@ -11,4 +11,4 @@ FILE_LICENCE ( GPL2_OR_LATER ); extern void timer2_udelay ( unsigned long usecs ); -#endif /* _GPXE_TIMER2_H */ +#endif /* _IPXE_TIMER2_H */ diff --git a/src/arch/i386/include/gpxe/x86_io.h b/src/arch/i386/include/ipxe/x86_io.h index beb5b22a..a79501e2 100644 --- a/src/arch/i386/include/gpxe/x86_io.h +++ b/src/arch/i386/include/ipxe/x86_io.h @@ -1,9 +1,9 @@ -#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 @@ -150,4 +150,4 @@ IOAPI_INLINE ( x86, mb ) ( void ) { __asm__ __volatile__ ( "lock; addl $0, 0(%%esp)" : : : "memory" ); } -#endif /* _GPXE_X86_IO_H */ +#endif /* _IPXE_X86_IO_H */ diff --git a/src/arch/i386/include/pxe.h b/src/arch/i386/include/pxe.h index f4a34a6e..f93a1cdf 100644 --- a/src/arch/i386/include/pxe.h +++ b/src/arch/i386/include/pxe.h @@ -5,7 +5,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 { diff --git a/src/arch/i386/include/realmode.h b/src/arch/i386/include/realmode.h index a0a830b9..dafc5a32 100644 --- a/src/arch/i386/include/realmode.h +++ b/src/arch/i386/include/realmode.h @@ -3,7 +3,7 @@ #include <stdint.h> #include <registers.h> -#include <gpxe/uaccess.h> +#include <ipxe/uaccess.h> /* * Data structures and type definitions diff --git a/src/arch/i386/include/undi.h b/src/arch/i386/include/undi.h index de6925b6..325fcbbf 100644 --- a/src/arch/i386/include/undi.h +++ b/src/arch/i386/include/undi.h @@ -11,7 +11,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #ifndef ASSEMBLY -#include <gpxe/device.h> +#include <ipxe/device.h> #include <pxe_types.h> /** An UNDI device diff --git a/src/arch/i386/interface/pcbios/abft.c b/src/arch/i386/interface/pcbios/abft.c index 86941728..9aa2f098 100644 --- a/src/arch/i386/interface/pcbios/abft.c +++ b/src/arch/i386/interface/pcbios/abft.c @@ -19,9 +19,9 @@ 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 * @@ -30,7 +30,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); */ #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 = { @@ -38,7 +38,7 @@ struct abft_table __data16 ( abftab ) __attribute__ (( aligned ( 16 ) )) = { .length = sizeof ( abftab ), .revision = 1, .oem_id = "FENSYS", - .oem_table_id = "gPXE", + .oem_table_id = "iPXE", }, }; diff --git a/src/arch/i386/interface/pcbios/aoeboot.c b/src/arch/i386/interface/pcbios/aoeboot.c index 2670b15d..388cd140 100644 --- a/src/arch/i386/interface/pcbios/aoeboot.c +++ b/src/arch/i386/interface/pcbios/aoeboot.c @@ -3,11 +3,11 @@ #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 ); diff --git a/src/arch/i386/interface/pcbios/bios_nap.c b/src/arch/i386/interface/pcbios/bios_nap.c index e38cac7a..7f461466 100644 --- a/src/arch/i386/interface/pcbios/bios_nap.c +++ b/src/arch/i386/interface/pcbios/bios_nap.c @@ -1,4 +1,4 @@ -#include <gpxe/nap.h> +#include <ipxe/nap.h> #include <realmode.h> FILE_LICENCE ( GPL2_OR_LATER ); diff --git a/src/arch/i386/interface/pcbios/bios_smbios.c b/src/arch/i386/interface/pcbios/bios_smbios.c index 094214bd..cde3d060 100644 --- a/src/arch/i386/interface/pcbios/bios_smbios.c +++ b/src/arch/i386/interface/pcbios/bios_smbios.c @@ -22,8 +22,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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> diff --git a/src/arch/i386/interface/pcbios/bios_timer.c b/src/arch/i386/interface/pcbios/bios_timer.c index 8ecf7c12..70c3986b 100644 --- a/src/arch/i386/interface/pcbios/bios_timer.c +++ b/src/arch/i386/interface/pcbios/bios_timer.c @@ -24,7 +24,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); * */ -#include <gpxe/timer.h> +#include <ipxe/timer.h> #include <realmode.h> #include <bios.h> diff --git a/src/arch/i386/interface/pcbios/ib_srpboot.c b/src/arch/i386/interface/pcbios/ib_srpboot.c index b1cbc337..711c1e93 100644 --- a/src/arch/i386/interface/pcbios/ib_srpboot.c +++ b/src/arch/i386/interface/pcbios/ib_srpboot.c @@ -3,10 +3,10 @@ #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 ); diff --git a/src/arch/i386/interface/pcbios/ibft.c b/src/arch/i386/interface/pcbios/ibft.c index adf8e6b9..63dba65e 100644 --- a/src/arch/i386/interface/pcbios/ibft.c +++ b/src/arch/i386/interface/pcbios/ibft.c @@ -33,14 +33,14 @@ FILE_LICENCE ( BSD2 ); #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 * @@ -54,8 +54,8 @@ FILE_LICENCE ( BSD2 ); */ #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 */ @@ -64,7 +64,7 @@ struct gpxe_ibft __data16 ( ibftab ) = { .length = sizeof ( ibftab ), .revision = 1, .oem_id = "FENSYS", - .oem_table_id = "gPXE", + .oem_table_id = "iPXE", }, /* Control block */ .control = { diff --git a/src/arch/i386/interface/pcbios/int13.c b/src/arch/i386/interface/pcbios/int13.c index 87b613a8..a2cf5e6b 100644 --- a/src/arch/i386/interface/pcbios/int13.c +++ b/src/arch/i386/interface/pcbios/int13.c @@ -23,9 +23,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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> diff --git a/src/arch/i386/interface/pcbios/iscsiboot.c b/src/arch/i386/interface/pcbios/iscsiboot.c index 00efd8ff..12c5566d 100644 --- a/src/arch/i386/interface/pcbios/iscsiboot.c +++ b/src/arch/i386/interface/pcbios/iscsiboot.c @@ -3,10 +3,10 @@ #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 ); diff --git a/src/arch/i386/interface/pcbios/keepsan.c b/src/arch/i386/interface/pcbios/keepsan.c index 904e017d..b2a93177 100644 --- a/src/arch/i386/interface/pcbios/keepsan.c +++ b/src/arch/i386/interface/pcbios/keepsan.c @@ -1,9 +1,9 @@ #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 = { diff --git a/src/arch/i386/interface/pcbios/memtop_umalloc.c b/src/arch/i386/interface/pcbios/memtop_umalloc.c index 0645fe63..51240f2a 100644 --- a/src/arch/i386/interface/pcbios/memtop_umalloc.c +++ b/src/arch/i386/interface/pcbios/memtop_umalloc.c @@ -27,10 +27,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 ) diff --git a/src/arch/i386/interface/pcbios/pcibios.c b/src/arch/i386/interface/pcbios/pcibios.c index f2c3880c..4d09c054 100644 --- a/src/arch/i386/interface/pcbios/pcibios.c +++ b/src/arch/i386/interface/pcbios/pcibios.c @@ -19,7 +19,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> -#include <gpxe/pci.h> +#include <ipxe/pci.h> #include <realmode.h> /** @file diff --git a/src/arch/i386/interface/pcbios/sbft.c b/src/arch/i386/interface/pcbios/sbft.c index 12927c77..6d51020a 100644 --- a/src/arch/i386/interface/pcbios/sbft.c +++ b/src/arch/i386/interface/pcbios/sbft.c @@ -38,14 +38,14 @@ FILE_LICENCE ( BSD2 ); #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 */ @@ -54,7 +54,7 @@ struct gpxe_sbft __data16 ( sbftab ) = { .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 ), diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/i386/interface/pxe/pxe_call.c index 66a9b1e2..f6b3fc54 100644 --- a/src/arch/i386/interface/pxe/pxe_call.c +++ b/src/arch/i386/interface/pxe/pxe_call.c @@ -18,8 +18,8 @@ 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> diff --git a/src/arch/i386/interface/pxe/pxe_errors.c b/src/arch/i386/interface/pxe/pxe_errors.c index f884ef8a..f6bbd304 100644 --- a/src/arch/i386/interface/pxe/pxe_errors.c +++ b/src/arch/i386/interface/pxe/pxe_errors.c @@ -1,5 +1,5 @@ #include <errno.h> -#include <gpxe/errortab.h> +#include <ipxe/errortab.h> /* * This table was generated from the relevant section of errno.h using diff --git a/src/arch/i386/interface/pxe/pxe_file.c b/src/arch/i386/interface/pxe/pxe_file.c index 8d832123..26762568 100644 --- a/src/arch/i386/interface/pxe/pxe_file.c +++ b/src/arch/i386/interface/pxe/pxe_file.c @@ -8,9 +8,9 @@ #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> @@ -245,7 +245,7 @@ segoff_t __data16 ( pxe_exit_hook ) = { 0, 0 }; * @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 * @@ -264,7 +264,7 @@ PXENV_EXIT_t pxenv_file_api_check ( struct s_PXENV_FILE_API_CHECK *file_api_chec 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 ) diff --git a/src/arch/i386/interface/pxe/pxe_loader.c b/src/arch/i386/interface/pxe/pxe_loader.c index b35caf77..63858be2 100644 --- a/src/arch/i386/interface/pxe/pxe_loader.c +++ b/src/arch/i386/interface/pxe/pxe_loader.c @@ -18,7 +18,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/init.h> +#include <ipxe/init.h> #include "pxe.h" #include "pxe_call.h" diff --git a/src/arch/i386/interface/pxe/pxe_preboot.c b/src/arch/i386/interface/pxe/pxe_preboot.c index 22be2e02..1d36faea 100644 --- a/src/arch/i386/interface/pxe/pxe_preboot.c +++ b/src/arch/i386/interface/pxe/pxe_preboot.c @@ -28,14 +28,14 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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" diff --git a/src/arch/i386/interface/pxe/pxe_tftp.c b/src/arch/i386/interface/pxe/pxe_tftp.c index e0ec5f1d..84f6527a 100644 --- a/src/arch/i386/interface/pxe/pxe_tftp.c +++ b/src/arch/i386/interface/pxe/pxe_tftp.c @@ -28,12 +28,12 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 */ diff --git a/src/arch/i386/interface/pxe/pxe_udp.c b/src/arch/i386/interface/pxe/pxe_udp.c index f4702201..cdc9d0ae 100644 --- a/src/arch/i386/interface/pxe/pxe_udp.c +++ b/src/arch/i386/interface/pxe/pxe_udp.c @@ -6,10 +6,10 @@ #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> /* diff --git a/src/arch/i386/interface/pxe/pxe_undi.c b/src/arch/i386/interface/pxe/pxe_undi.c index a2b0b773..3ebee94e 100644 --- a/src/arch/i386/interface/pxe/pxe_undi.c +++ b/src/arch/i386/interface/pxe/pxe_undi.c @@ -29,14 +29,14 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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" /** diff --git a/src/arch/i386/interface/pxeparent/pxeparent.c b/src/arch/i386/interface/pxeparent/pxeparent.c index 582db5d2..dd0bbc5c 100644 --- a/src/arch/i386/interface/pxeparent/pxeparent.c +++ b/src/arch/i386/interface/pxeparent/pxeparent.c @@ -18,7 +18,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/dhcp.h> +#include <ipxe/dhcp.h> #include <pxeparent.h> #include <pxe_api.h> #include <pxe_types.h> diff --git a/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c b/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c index 66059437..439ebda3 100644 --- a/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c +++ b/src/arch/i386/interface/pxeparent/pxeparent_dhcp.c @@ -19,8 +19,8 @@ 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> diff --git a/src/arch/i386/interface/syslinux/com32_call.c b/src/arch/i386/interface/syslinux/com32_call.c index d2c3f918..7a758373 100644 --- a/src/arch/i386/interface/syslinux/com32_call.c +++ b/src/arch/i386/interface/syslinux/com32_call.c @@ -27,7 +27,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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 ) diff --git a/src/arch/i386/interface/syslinux/com32_wrapper.S b/src/arch/i386/interface/syslinux/com32_wrapper.S index 5c5bd139..0ac6ff2d 100644 --- a/src/arch/i386/interface/syslinux/com32_wrapper.S +++ b/src/arch/i386/interface/syslinux/com32_wrapper.S @@ -82,7 +82,7 @@ com32_wrapper: .data -/* Internal gPXE virtual address space %esp */ +/* Internal iPXE virtual address space %esp */ .globl com32_internal_esp .lcomm com32_internal_esp, 4 diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c index 51a1b6d9..e5bf11c9 100644 --- a/src/arch/i386/interface/syslinux/comboot_call.c +++ b/src/arch/i386/interface/syslinux/comboot_call.c @@ -33,21 +33,21 @@ FILE_LICENCE ( GPL2_OR_LATER ); #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, [] ) = ""; @@ -335,7 +335,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) { 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; @@ -396,7 +396,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) { 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) @@ -453,9 +453,9 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) { 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; diff --git a/src/arch/i386/interface/syslinux/comboot_resolv.c b/src/arch/i386/interface/syslinux/comboot_resolv.c index 30ac502e..c505d96b 100644 --- a/src/arch/i386/interface/syslinux/comboot_resolv.c +++ b/src/arch/i386/interface/syslinux/comboot_resolv.c @@ -1,9 +1,9 @@ #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 ); diff --git a/src/arch/i386/prefix/dskprefix.S b/src/arch/i386/prefix/dskprefix.S index 60d351f7..0f4b3ba0 100644 --- a/src/arch/i386/prefix/dskprefix.S +++ b/src/arch/i386/prefix/dskprefix.S @@ -355,7 +355,7 @@ msg1end: .word 0xAA55 start_runtime: - /* Install gPXE */ + /* Install iPXE */ call install /* Set up real-mode stack */ @@ -373,7 +373,7 @@ start_runtime: call prot_call popl %ecx /* discard */ - /* Uninstall gPXE */ + /* Uninstall iPXE */ call uninstall /* Boot next device */ diff --git a/src/arch/i386/prefix/hdprefix.S b/src/arch/i386/prefix/hdprefix.S index 05767567..820bad35 100644 --- a/src/arch/i386/prefix/hdprefix.S +++ b/src/arch/i386/prefix/hdprefix.S @@ -78,13 +78,13 @@ load_length: 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 */ @@ -102,7 +102,7 @@ start_image: call prot_call popl %ecx /* discard */ - /* Uninstall gPXE */ + /* Uninstall iPXE */ call uninstall /* Boot next device */ diff --git a/src/arch/i386/prefix/lkrnprefix.S b/src/arch/i386/prefix/lkrnprefix.S index 101d0388..bbda3366 100644 --- a/src/arch/i386/prefix/lkrnprefix.S +++ b/src/arch/i386/prefix/lkrnprefix.S @@ -178,20 +178,20 @@ setup_code: * 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 */ @@ -209,7 +209,7 @@ run_gpxe: call prot_call popl %ecx /* discard */ - /* Uninstall gPXE */ + /* Uninstall iPXE */ call uninstall /* Boot next device */ diff --git a/src/arch/i386/prefix/nbiprefix.S b/src/arch/i386/prefix/nbiprefix.S index 607d80fb..16d22de8 100644 --- a/src/arch/i386/prefix/nbiprefix.S +++ b/src/arch/i386/prefix/nbiprefix.S @@ -50,7 +50,7 @@ memlen: .long -512 ***************************************************************************** */ entry: - /* Install gPXE */ + /* Install iPXE */ call install /* Jump to .text16 segment */ @@ -64,7 +64,7 @@ entry: call prot_call popl %ecx /* discard */ - /* Uninstall gPXE */ + /* Uninstall iPXE */ call uninstall /* Reboot system */ diff --git a/src/arch/i386/prefix/pxeprefix.S b/src/arch/i386/prefix/pxeprefix.S index e728c482..1f5930af 100644 --- a/src/arch/i386/prefix/pxeprefix.S +++ b/src/arch/i386/prefix/pxeprefix.S @@ -441,7 +441,7 @@ print_free_basemem: ***************************************************************************** */ finished: - jmp run_gpxe + jmp run_ipxe /***************************************************************************** * Subroutine: print segment:offset address @@ -686,12 +686,12 @@ flags: .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 */ @@ -731,7 +731,7 @@ run_gpxe: call prot_call popl %ecx /* discard */ - /* Uninstall gPXE */ + /* Uninstall iPXE */ call uninstall /* Restore PXE stack */ diff --git a/src/arch/i386/prefix/romprefix.S b/src/arch/i386/prefix/romprefix.S index 02e54976..5ea53aac 100644 --- a/src/arch/i386/prefix/romprefix.S +++ b/src/arch/i386/prefix/romprefix.S @@ -130,7 +130,7 @@ pnpheader: /* Manufacturer string */ mfgstr: - .asciz "http://etherboot.org" + .asciz "http://ipxe.org" .size mfgstr, . - mfgstr /* Product string @@ -477,7 +477,7 @@ no_pmm: 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. */ @@ -503,7 +503,7 @@ out: * 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, @@ -516,7 +516,7 @@ init_message: .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" @@ -913,7 +913,7 @@ int19_entry: 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 @@ -972,7 +972,7 @@ exec: /* Set %ds = %cs */ movw %ax, %ss movw $0x7c00, %sp - /* Install gPXE */ + /* Install iPXE */ movl image_source, %esi movl decompress_to, %edi call alloc_basemem @@ -993,7 +993,7 @@ exec: /* Set %ds = %cs */ call prot_call popl %ecx /* discard */ - /* Uninstall gPXE */ + /* Uninstall iPXE */ call uninstall /* Restore BIOS stack */ diff --git a/src/arch/x86/core/pcidirect.c b/src/arch/x86/core/pcidirect.c index 2c61d9ca..38e056d5 100644 --- a/src/arch/x86/core/pcidirect.c +++ b/src/arch/x86/core/pcidirect.c @@ -18,8 +18,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/io.h> -#include <gpxe/pci.h> +#include <ipxe/io.h> +#include <ipxe/pci.h> /** @file * diff --git a/src/arch/x86/include/bits/pci_io.h b/src/arch/x86/include/bits/pci_io.h index f6efcdac..01b12326 100644 --- a/src/arch/x86/include/bits/pci_io.h +++ b/src/arch/x86/include/bits/pci_io.h @@ -9,7 +9,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/pcibios.h> -#include <gpxe/pcidirect.h> +#include <ipxe/pcibios.h> +#include <ipxe/pcidirect.h> #endif /* _BITS_PCI_IO_H */ diff --git a/src/arch/x86/include/gpxe/efi/efix86_nap.h b/src/arch/x86/include/ipxe/efi/efix86_nap.h index 833c922c..e85a272b 100644 --- a/src/arch/x86/include/gpxe/efi/efix86_nap.h +++ b/src/arch/x86/include/ipxe/efi/efix86_nap.h @@ -1,5 +1,5 @@ -#ifndef _GPXE_EFIX86_NAP_H -#define _GPXE_EFIX86_NAP_H +#ifndef _IPXE_EFIX86_NAP_H +#define _IPXE_EFIX86_NAP_H /** @file * @@ -15,4 +15,4 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define NAP_PREFIX_efix86 __efix86_ #endif -#endif /* _GPXE_EFIX86_NAP_H */ +#endif /* _IPXE_EFIX86_NAP_H */ diff --git a/src/arch/x86/include/gpxe/pcibios.h b/src/arch/x86/include/ipxe/pcibios.h index 93a6eb8a..36af7fcd 100644 --- a/src/arch/x86/include/gpxe/pcibios.h +++ b/src/arch/x86/include/ipxe/pcibios.h @@ -1,5 +1,5 @@ -#ifndef _GPXE_PCIBIOS_H -#define _GPXE_PCIBIOS_H +#ifndef _IPXE_PCIBIOS_H +#define _IPXE_PCIBIOS_H #include <stdint.h> @@ -132,4 +132,4 @@ PCIAPI_INLINE ( pcbios, pci_write_config_dword ) ( struct pci_device *pci, return pcibios_write ( pci, PCIBIOS_WRITE_CONFIG_DWORD | where, value); } -#endif /* _GPXE_PCIBIOS_H */ +#endif /* _IPXE_PCIBIOS_H */ diff --git a/src/arch/x86/include/gpxe/pcidirect.h b/src/arch/x86/include/ipxe/pcidirect.h index 8b705fb2..4e933c43 100644 --- a/src/arch/x86/include/gpxe/pcidirect.h +++ b/src/arch/x86/include/ipxe/pcidirect.h @@ -4,7 +4,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> -#include <gpxe/io.h> +#include <ipxe/io.h> #ifdef PCIAPI_DIRECT #define PCIAPI_PREFIX_direct diff --git a/src/arch/x86/interface/efi/efix86_nap.c b/src/arch/x86/interface/efi/efix86_nap.c index 89a4e3ba..b6bee627 100644 --- a/src/arch/x86/interface/efi/efix86_nap.c +++ b/src/arch/x86/interface/efi/efix86_nap.c @@ -18,12 +18,12 @@ FILE_LICENCE ( GPL2_OR_LATER ); -#include <gpxe/nap.h> -#include <gpxe/efi/efi.h> +#include <ipxe/nap.h> +#include <ipxe/efi/efi.h> /** @file * - * gPXE CPU sleeping API for EFI + * iPXE CPU sleeping API for EFI * */ diff --git a/src/arch/x86/prefix/efidrvprefix.c b/src/arch/x86/prefix/efidrvprefix.c index 36d56508..1de08a37 100644 --- a/src/arch/x86/prefix/efidrvprefix.c +++ b/src/arch/x86/prefix/efidrvprefix.c @@ -19,8 +19,8 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> -#include <gpxe/init.h> -#include <gpxe/efi/efi.h> +#include <ipxe/init.h> +#include <ipxe/efi/efi.h> /** * EFI entry point @@ -37,7 +37,7 @@ EFI_STATUS EFIAPI _start ( EFI_HANDLE image_handle, if ( ( efirc = efi_init ( image_handle, systab ) ) != 0 ) return efirc; - /* Initialise gPXE environment */ + /* Initialise iPXE environment */ initialise(); startup(); diff --git a/src/arch/x86/prefix/efiprefix.c b/src/arch/x86/prefix/efiprefix.c index 4cc9e04a..61a9fc64 100644 --- a/src/arch/x86/prefix/efiprefix.c +++ b/src/arch/x86/prefix/efiprefix.c @@ -19,7 +19,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> -#include <gpxe/efi/efi.h> +#include <ipxe/efi/efi.h> /** * EFI entry point diff --git a/src/arch/x86_64/include/bits/nap.h b/src/arch/x86_64/include/bits/nap.h index 0a0c8a24..8b42c0a4 100644 --- a/src/arch/x86_64/include/bits/nap.h +++ b/src/arch/x86_64/include/bits/nap.h @@ -7,6 +7,6 @@ * */ -#include <gpxe/efi/efix86_nap.h> +#include <ipxe/efi/efix86_nap.h> #endif /* _BITS_MAP_H */ |