[legal] Relicense files under GPL2_OR_LATER_OR_UBDL

Several of the assembly files in arch/i386/prefix were missed by the
automated relicensing tool due to missing licence declarations, code
dating back to the initial git revision, etc.  Manual review shows
that these files may be relicensed.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/i386/prefix/hdprefix.S b/src/arch/i386/prefix/hdprefix.S
index 876bfe1bee2ca120c5da23b0789b73770b1a0eb5..1d012d80ba2366027716f85bc9b1c3ae2a4b7883 100644 (file)
--- a/src/arch/i386/prefix/hdprefix.S
+++ b/src/arch/i386/prefix/hdprefix.S
@@ -1,4 +1,4 @@
-FILE_LICENCE ( GPL2_OR_LATER )
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
        .text
        .arch i386

diff --git a/src/arch/i386/prefix/lkrnprefix.S b/src/arch/i386/prefix/lkrnprefix.S
index 259bc6ba50d129092fa8f94e9df166746d8e6856..64135e14b9e129ca07efbde8001eda01441f3aa3 100644 (file)
--- a/src/arch/i386/prefix/lkrnprefix.S
+++ b/src/arch/i386/prefix/lkrnprefix.S
@@ -1,4 +1,4 @@
-FILE_LICENCE ( GPL_ANY )
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
 #define BZI_LOAD_HIGH_ADDR 0x100000
 

diff --git a/src/arch/i386/prefix/mbr.S b/src/arch/i386/prefix/mbr.S
index adfe20410f4dba6fa1461aeb53ec8d2481fd48e3..a1e237de823dd64ec184a59d484b995270ec7a63 100644 (file)
--- a/src/arch/i386/prefix/mbr.S
+++ b/src/arch/i386/prefix/mbr.S
@@ -1,3 +1,5 @@
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
+
        .text
        .arch i386
        .section ".prefix", "awx", @progbits

diff --git a/src/arch/i386/prefix/nbiprefix.S b/src/arch/i386/prefix/nbiprefix.S
index 06e7df5b747bc791e57ea3608cfb2c2ace61807a..16c79566c3a610831da1fbab6d16773fe3ceca4d 100644 (file)
--- a/src/arch/i386/prefix/nbiprefix.S
+++ b/src/arch/i386/prefix/nbiprefix.S
@@ -1,3 +1,5 @@
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
+
        .text
        .arch i386
        .code16

diff --git a/src/arch/i386/prefix/nullprefix.S b/src/arch/i386/prefix/nullprefix.S
index 032d41e0f8f76c72e09e5c17f70d2995f1b19eba..bd0ff339e8d7e9250e06606927c18116a76614c7 100644 (file)
--- a/src/arch/i386/prefix/nullprefix.S
+++ b/src/arch/i386/prefix/nullprefix.S
@@ -1,3 +1,5 @@
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
+
        .org    0
        .text
        .arch i386

diff --git a/src/arch/i386/prefix/pxeprefix.S b/src/arch/i386/prefix/pxeprefix.S
index 6e29c794929b097b10289179e5a1dbaa9dcf5bc6..465ce43459af4329356690da163fd1ca5dd5ef96 100644 (file)
--- a/src/arch/i386/prefix/pxeprefix.S
+++ b/src/arch/i386/prefix/pxeprefix.S
@@ -1,4 +1,4 @@
-FILE_LICENCE ( GPL2_OR_LATER )
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
 
 #define PXENV_UNDI_SHUTDOWN            0x0005
 #define        PXENV_UNDI_GET_NIC_TYPE         0x0012

diff --git a/src/arch/i386/prefix/usbdisk.S b/src/arch/i386/prefix/usbdisk.S
index fa7d1956ea5eaa6b3b6b25029862b4a7f343c42e..8dc30612a45ca76c2072ff04063526b2cf02596f 100644 (file)
--- a/src/arch/i386/prefix/usbdisk.S
+++ b/src/arch/i386/prefix/usbdisk.S
@@ -1,3 +1,5 @@
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL )
+
        .text
        .arch i386
        .section ".prefix", "awx", @progbits