diff options
Diffstat (limited to 'src/arch/x86')
-rw-r--r-- | src/arch/x86/core/pcidirect.c | 4 | ||||
-rw-r--r-- | src/arch/x86/include/bits/pci_io.h | 4 | ||||
-rw-r--r-- | src/arch/x86/include/ipxe/efi/efix86_nap.h (renamed from src/arch/x86/include/gpxe/efi/efix86_nap.h) | 6 | ||||
-rw-r--r-- | src/arch/x86/include/ipxe/pcibios.h (renamed from src/arch/x86/include/gpxe/pcibios.h) | 6 | ||||
-rw-r--r-- | src/arch/x86/include/ipxe/pcidirect.h (renamed from src/arch/x86/include/gpxe/pcidirect.h) | 2 | ||||
-rw-r--r-- | src/arch/x86/interface/efi/efix86_nap.c | 6 | ||||
-rw-r--r-- | src/arch/x86/prefix/efidrvprefix.c | 6 | ||||
-rw-r--r-- | src/arch/x86/prefix/efiprefix.c | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/src/arch/x86/core/pcidirect.c b/src/arch/x86/core/pcidirect.c index 2c61d9c..38e056d 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 f6efcda..01b1232 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 833c922..e85a272 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 93a6eb8..36af7fc 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 8b705fb..4e933c4 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 89a4e3b..b6bee62 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 36d5650..1de08a3 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 4cc9e04..61a9fc6 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 |