diff options
| author | Michael Brown | 2015-03-02 12:54:40 +0100 |
|---|---|---|
| committer | Michael Brown | 2015-03-02 15:17:31 +0100 |
| commit | b6ee89ffb5029d02cb1d8668757fa2b74b11e0a3 (patch) | |
| tree | e838453dd52bb4767112aaff774e5912514afd2c /src/arch/x86/drivers | |
| parent | [legal] Add UBDL relicensing tool (diff) | |
| download | ipxe-b6ee89ffb5029d02cb1d8668757fa2b74b11e0a3.tar.gz ipxe-b6ee89ffb5029d02cb1d8668757fa2b74b11e0a3.tar.xz ipxe-b6ee89ffb5029d02cb1d8668757fa2b74b11e0a3.zip | |
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
Relicense files for which I am the sole author (as identified by
util/relicense.pl).
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/x86/drivers')
| -rw-r--r-- | src/arch/x86/drivers/hyperv/hyperv.c | 6 | ||||
| -rw-r--r-- | src/arch/x86/drivers/hyperv/hyperv.h | 2 | ||||
| -rw-r--r-- | src/arch/x86/drivers/xen/hvm.c | 6 | ||||
| -rw-r--r-- | src/arch/x86/drivers/xen/hvm.h | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/arch/x86/drivers/hyperv/hyperv.c b/src/arch/x86/drivers/hyperv/hyperv.c index ff5e4987b..c3c0e86c0 100644 --- a/src/arch/x86/drivers/hyperv/hyperv.c +++ b/src/arch/x86/drivers/hyperv/hyperv.c @@ -15,9 +15,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. + * + * You can also choose to distribute this program under the terms of + * the Unmodified Binary Distribution Licence (as given in the file + * COPYING.UBDL), provided that you have satisfied its requirements. */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /** @file * diff --git a/src/arch/x86/drivers/hyperv/hyperv.h b/src/arch/x86/drivers/hyperv/hyperv.h index d1733d6cd..0d09beb44 100644 --- a/src/arch/x86/drivers/hyperv/hyperv.h +++ b/src/arch/x86/drivers/hyperv/hyperv.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /** Get vendor identification */ #define HV_CPUID_VENDOR_ID 0x40000000UL diff --git a/src/arch/x86/drivers/xen/hvm.c b/src/arch/x86/drivers/xen/hvm.c index 7406ca68d..6f3be8e2e 100644 --- a/src/arch/x86/drivers/xen/hvm.c +++ b/src/arch/x86/drivers/xen/hvm.c @@ -15,9 +15,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. + * + * You can also choose to distribute this program under the terms of + * the Unmodified Binary Distribution Licence (as given in the file + * COPYING.UBDL), provided that you have satisfied its requirements. */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <stdint.h> #include <stdio.h> diff --git a/src/arch/x86/drivers/xen/hvm.h b/src/arch/x86/drivers/xen/hvm.h index 325d20d66..72ed94f6d 100644 --- a/src/arch/x86/drivers/xen/hvm.h +++ b/src/arch/x86/drivers/xen/hvm.h @@ -7,7 +7,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include <stdint.h> #include <ipxe/xen.h> |