[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>

23 files changed, 55 insertions, 23 deletions

diff --git a/src/config/branding.h b/src/config/branding.h
index cca68b6e..73f00af9 100644
--- a/src/config/branding.h
+++ b/src/config/branding.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
diff --git a/src/config/config_ethernet.c b/src/config/config_ethernet.c
index efb91202..e9239955 100644
--- a/src/config/config_ethernet.c
+++ b/src/config/config_ethernet.c
@@ -13,9 +13,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 <config/general.h>
 
diff --git a/src/config/config_fc.c b/src/config/config_fc.c
index 7da3c38c..2b317935 100644
--- a/src/config/config_fc.c
+++ b/src/config/config_fc.c
@@ -13,9 +13,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 <config/general.h>
 
diff --git a/src/config/config_infiniband.c b/src/config/config_infiniband.c
index 9126c1ff..13ed25a8 100644
--- a/src/config/config_infiniband.c
+++ b/src/config/config_infiniband.c
@@ -13,9 +13,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 <config/general.h>
 
diff --git a/src/config/config_isaromprefix.c b/src/config/config_isaromprefix.c
index 7e7d2dc7..d5a2b03e 100644
--- a/src/config/config_isaromprefix.c
+++ b/src/config/config_isaromprefix.c
@@ -13,8 +13,12 @@
  * 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 "config_romprefix.c"
diff --git a/src/config/config_mromprefix.c b/src/config/config_mromprefix.c
index 7e7d2dc7..d5a2b03e 100644
--- a/src/config/config_mromprefix.c
+++ b/src/config/config_mromprefix.c
@@ -13,8 +13,12 @@
  * 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 "config_romprefix.c"
diff --git a/src/config/config_pciromprefix.c b/src/config/config_pciromprefix.c
index 7e7d2dc7..d5a2b03e 100644
--- a/src/config/config_pciromprefix.c
+++ b/src/config/config_pciromprefix.c
@@ -13,8 +13,12 @@
  * 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 "config_romprefix.c"
diff --git a/src/config/config_route.c b/src/config/config_route.c
index 656d30ce..38812ebb 100644
--- a/src/config/config_route.c
+++ b/src/config/config_route.c
@@ -13,9 +13,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 <config/general.h>
 
diff --git a/src/config/config_usb.c b/src/config/config_usb.c
index faed7fad..55730235 100644
--- a/src/config/config_usb.c
+++ b/src/config/config_usb.c
@@ -13,9 +13,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 <config/general.h>
 
diff --git a/src/config/console.h b/src/config/console.h
index 908ec5a0..d71ef481 100644
--- a/src/config/console.h
+++ b/src/config/console.h
@@ -10,7 +10,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
diff --git a/src/config/crypto.h b/src/config/crypto.h
index 1e021b0f..9e1f8b2f 100644
--- a/src/config/crypto.h
+++ b/src/config/crypto.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** Margin of error (in seconds) allowed in signed timestamps
  *
diff --git a/src/config/defaults.h b/src/config/defaults.h
index 389c0b07..32d6dbcc 100644
--- a/src/config/defaults.h
+++ b/src/config/defaults.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_DEFAULTS_H
 #define CONFIG_DEFAULTS_H
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #define CONFIG_DEFAULTS(_platform) <config/defaults/_platform.h>
 
diff --git a/src/config/entropy.h b/src/config/entropy.h
index 7de2f673..c79060fd 100644
--- a/src/config/entropy.h
+++ b/src/config/entropy.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
diff --git a/src/config/ioapi.h b/src/config/ioapi.h
index ce19c6d7..abe5a50c 100644
--- a/src/config/ioapi.h
+++ b/src/config/ioapi.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
diff --git a/src/config/named.h b/src/config/named.h
index 36efdabd..ddde6f0a 100644
--- a/src/config/named.h
+++ b/src/config/named.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /* config/<name>/<header>.h */
 #ifdef CONFIG
diff --git a/src/config/nap.h b/src/config/nap.h
index 187af428..e4fe9796 100644
--- a/src/config/nap.h
+++ b/src/config/nap.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
diff --git a/src/config/reboot.h b/src/config/reboot.h
index 240ef87b..2d1648e7 100644
--- a/src/config/reboot.h
+++ b/src/config/reboot.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
diff --git a/src/config/sanboot.h b/src/config/sanboot.h
index 1d7f5f17..ccc4bda1 100644
--- a/src/config/sanboot.h
+++ b/src/config/sanboot.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
diff --git a/src/config/settings.h b/src/config/settings.h
index 42fe9cc8..b3aabbe5 100644
--- a/src/config/settings.h
+++ b/src/config/settings.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #define	PCI_SETTINGS	/* PCI device settings */
 //#define	CPUID_SETTINGS	/* CPUID settings */
diff --git a/src/config/sideband.h b/src/config/sideband.h
index 039bb5d0..dd704f9b 100644
--- a/src/config/sideband.h
+++ b/src/config/sideband.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 //#define	CONFIG_BOFM	/* IBM's BladeCenter Open Fabric Manager */
 
diff --git a/src/config/time.h b/src/config/time.h
index 0576211f..678f6f86 100644
--- a/src/config/time.h
+++ b/src/config/time.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
diff --git a/src/config/timer.h b/src/config/timer.h
index abd66985..5a54d398 100644
--- a/src/config/timer.h
+++ b/src/config/timer.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>
 
diff --git a/src/config/umalloc.h b/src/config/umalloc.h
index 245c6b4a..832dd21d 100644
--- a/src/config/umalloc.h
+++ b/src/config/umalloc.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <config/defaults.h>