12 files changed, 22 insertions, 1 deletions
diff --git a/gpxe/src/arch/x86/Makefile b/gpxe/src/arch/x86/Makefile
index a7c4bc0e..f5f67ac7 100644
--- a/gpxe/src/arch/x86/Makefile
+++ b/gpxe/src/arch/x86/Makefile
@@ -1,6 +1,6 @@
 # Include common x86 headers
 #
-CFLAGS		+= -Iarch/x86/include
+INCDIRS		+= arch/x86/include
 
 # x86-specific directories containing source files
 #
diff --git a/gpxe/src/arch/x86/core/pcidirect.c b/gpxe/src/arch/x86/core/pcidirect.c
index db17215e..2c61d9ca 100644
--- a/gpxe/src/arch/x86/core/pcidirect.c
+++ b/gpxe/src/arch/x86/core/pcidirect.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+FILE_LICENCE ( GPL2_OR_LATER );
+
 #include <gpxe/io.h>
 #include <gpxe/pci.h>
 
diff --git a/gpxe/src/arch/x86/core/x86_string.c b/gpxe/src/arch/x86/core/x86_string.c
index c0224c7a..5838ebac 100644
--- a/gpxe/src/arch/x86/core/x86_string.c
+++ b/gpxe/src/arch/x86/core/x86_string.c
@@ -22,6 +22,8 @@
  *
  */
 
+FILE_LICENCE ( GPL2_OR_LATER );
+
 #include <string.h>
 
 /**
diff --git a/gpxe/src/arch/x86/include/bits/pci_io.h b/gpxe/src/arch/x86/include/bits/pci_io.h
index 0fbb439d..f6efcdac 100644
--- a/gpxe/src/arch/x86/include/bits/pci_io.h
+++ b/gpxe/src/arch/x86/include/bits/pci_io.h
@@ -7,6 +7,8 @@
  *
  */
 
+FILE_LICENCE ( GPL2_OR_LATER );
+
 #include <gpxe/pcibios.h>
 #include <gpxe/pcidirect.h>
 
diff --git a/gpxe/src/arch/x86/include/bits/string.h b/gpxe/src/arch/x86/include/bits/string.h
index 42ddeddf..a68868ac 100644
--- a/gpxe/src/arch/x86/include/bits/string.h
+++ b/gpxe/src/arch/x86/include/bits/string.h
@@ -21,6 +21,8 @@
  *		consider these trivial functions to be PD.
  */
 
+FILE_LICENCE ( PUBLIC_DOMAIN );
+
 #define __HAVE_ARCH_MEMCPY
 
 extern void * __memcpy ( void *dest, const void *src, size_t len );
diff --git a/gpxe/src/arch/x86/include/gpxe/efi/efix86_nap.h b/gpxe/src/arch/x86/include/gpxe/efi/efix86_nap.h
index 91424c54..833c922c 100644
--- a/gpxe/src/arch/x86/include/gpxe/efi/efix86_nap.h
+++ b/gpxe/src/arch/x86/include/gpxe/efi/efix86_nap.h
@@ -7,6 +7,8 @@
  *
  */
 
+FILE_LICENCE ( GPL2_OR_LATER );
+
 #ifdef NAP_EFIX86
 #define NAP_PREFIX_efix86
 #else
diff --git a/gpxe/src/arch/x86/include/gpxe/pcibios.h b/gpxe/src/arch/x86/include/gpxe/pcibios.h
index b86f5abd..93a6eb8a 100644
--- a/gpxe/src/arch/x86/include/gpxe/pcibios.h
+++ b/gpxe/src/arch/x86/include/gpxe/pcibios.h
@@ -9,6 +9,8 @@
  *
  */
 
+FILE_LICENCE ( GPL2_OR_LATER );
+
 #ifdef PCIAPI_PCBIOS
 #define PCIAPI_PREFIX_pcbios
 #else
diff --git a/gpxe/src/arch/x86/include/gpxe/pcidirect.h b/gpxe/src/arch/x86/include/gpxe/pcidirect.h
index fe433c6f..8b705fb2 100644
--- a/gpxe/src/arch/x86/include/gpxe/pcidirect.h
+++ b/gpxe/src/arch/x86/include/gpxe/pcidirect.h
@@ -1,6 +1,8 @@
 #ifndef _PCIDIRECT_H
 #define _PCIDIRECT_H
 
+FILE_LICENCE ( GPL2_OR_LATER );
+
 #include <stdint.h>
 #include <gpxe/io.h>
 
diff --git a/gpxe/src/arch/x86/interface/efi/efix86_nap.c b/gpxe/src/arch/x86/interface/efi/efix86_nap.c
index 45e99a68..89a4e3ba 100644
--- a/gpxe/src/arch/x86/interface/efi/efix86_nap.c
+++ b/gpxe/src/arch/x86/interface/efi/efix86_nap.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+FILE_LICENCE ( GPL2_OR_LATER );
+
 #include <gpxe/nap.h>
 #include <gpxe/efi/efi.h>
 
diff --git a/gpxe/src/arch/x86/prefix/efidrvprefix.c b/gpxe/src/arch/x86/prefix/efidrvprefix.c
index 5f631588..36d56508 100644
--- a/gpxe/src/arch/x86/prefix/efidrvprefix.c
+++ b/gpxe/src/arch/x86/prefix/efidrvprefix.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+FILE_LICENCE ( GPL2_OR_LATER );
+
 #include <stdlib.h>
 #include <gpxe/init.h>
 #include <gpxe/efi/efi.h>
diff --git a/gpxe/src/arch/x86/prefix/efiprefix.c b/gpxe/src/arch/x86/prefix/efiprefix.c
index b05b744d..4cc9e04a 100644
--- a/gpxe/src/arch/x86/prefix/efiprefix.c
+++ b/gpxe/src/arch/x86/prefix/efiprefix.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+FILE_LICENCE ( GPL2_OR_LATER );
+
 #include <stdlib.h>
 #include <gpxe/efi/efi.h>
 
diff --git a/gpxe/src/arch/x86/scripts/efi.lds b/gpxe/src/arch/x86/scripts/efi.lds
index aac31056..7525b81b 100644
--- a/gpxe/src/arch/x86/scripts/efi.lds
+++ b/gpxe/src/arch/x86/scripts/efi.lds
@@ -101,5 +101,6 @@ SECTIONS {
 	*(.eh_frame.*)
 	*(.rel)
 	*(.rel.*)
+	*(.discard)
     }
 }