diff options
| author | Michael Brown | 2015-03-11 15:23:14 +0100 |
|---|---|---|
| committer | Michael Brown | 2015-03-11 15:23:14 +0100 |
| commit | bc985ca08970951e2ba0ca16cb6eff17eedc1848 (patch) | |
| tree | d32787885155297232f0d09c12c45d075ab3a956 /src/arch/i386 | |
| parent | [smsc75xx] Add driver for SMSC/Microchip LAN75xx USB Ethernet NICs (diff) | |
| download | ipxe-bc985ca08970951e2ba0ca16cb6eff17eedc1848.tar.gz ipxe-bc985ca08970951e2ba0ca16cb6eff17eedc1848.tar.xz ipxe-bc985ca08970951e2ba0ca16cb6eff17eedc1848.zip | |
[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>
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/prefix/hdprefix.S | 2 | ||||
| -rw-r--r-- | src/arch/i386/prefix/lkrnprefix.S | 2 | ||||
| -rw-r--r-- | src/arch/i386/prefix/mbr.S | 2 | ||||
| -rw-r--r-- | src/arch/i386/prefix/nbiprefix.S | 2 | ||||
| -rw-r--r-- | src/arch/i386/prefix/nullprefix.S | 2 | ||||
| -rw-r--r-- | src/arch/i386/prefix/pxeprefix.S | 2 | ||||
| -rw-r--r-- | src/arch/i386/prefix/usbdisk.S | 2 |
7 files changed, 11 insertions, 3 deletions
diff --git a/src/arch/i386/prefix/hdprefix.S b/src/arch/i386/prefix/hdprefix.S index 876bfe1be..1d012d80b 100644 --- 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 259bc6ba5..64135e14b 100644 --- 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 adfe20410..a1e237de8 100644 --- 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 06e7df5b7..16c79566c 100644 --- 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 032d41e0f..bd0ff339e 100644 --- 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 6e29c7949..465ce4345 100644 --- 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 fa7d1956e..8dc30612a 100644 --- 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 |