Dual-license IBM code contributions

It was brought to our attention that U-Boot contains code derived from the
IBM OpenBIOS source code originally provided with some of the older PowerPC
4xx development boards.  As a result, the original license of this code has
been carried in the various files for a number of years in the U-Boot project.

IBM is dual-licensing the IBM code contributions already present in U-Boot
under either the terms of the GNU General Public License version 2, or the
original code license already present.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

diff --git a/board/cray/L1/init.S b/board/cray/L1/init.S
index 4b6b3f400303bb1fdb7803debc49a80081eb4847..d700ea76cf3504f737cd14ab1f1105ba589693d5 100644 (file)
--- a/board/cray/L1/init.S
+++ b/board/cray/L1/init.S
@@ -1,5 +1,9 @@
 /*------------------------------------------------------------------------------+ */
 /* */
+/*       This source code is dual-licensed.  You may use it under the terms */
+/*       of the GNU General Public License version 2, or under the license  */
+/*       below.                                                             */
+/*                                                                          */
 /*       This source code has been made available to you by IBM on an AS-IS */
 /*       basis.  Anyone receiving this source is licensed under IBM */
 /*       copyrights to use it in any way he or she deems fit, including */

diff --git a/board/csb272/init.S b/board/csb272/init.S
index ab371f20d4b75668d55b8873bd01dc38f95600f2..1cfef376a6932e115c7a323cfb724cc78aab387b 100644 (file)
--- a/board/csb272/init.S
+++ b/board/csb272/init.S
@@ -1,4 +1,6 @@
 /******************************************************************************
+ *   This source code is dual-licensed.  You may use it under the terms of the
+ *   GNU General Public License version 2, or under the license below.
  *
  *      This source code has been made available to you by IBM on an AS-IS
  *      basis.  Anyone receiving this source is licensed under IBM

diff --git a/board/csb472/init.S b/board/csb472/init.S
index 4b6958aefc0817bcf07b57b7cf2b43df998369f1..2cf8afc4994b6bc90cf17500c74dad8d423b8899 100644 (file)
--- a/board/csb472/init.S
+++ b/board/csb472/init.S
@@ -1,4 +1,6 @@
 /******************************************************************************
+ *   This source code is dual-licensed.  You may use it under the terms of the
+ *   GNU General Public License version 2, or under the license below.
  *
  *      This source code has been made available to you by IBM on an AS-IS
  *      basis.  Anyone receiving this source is licensed under IBM

diff --git a/board/eric/init.S b/board/eric/init.S
index 2304cc7bbe6d476e8689738b3cd750f402962068..4820dd08c7fe6030d6ccdff8d485a8f15b499d2a 100644 (file)
--- a/board/eric/init.S
+++ b/board/eric/init.S
@@ -1,5 +1,9 @@
 /*------------------------------------------------------------------------------+ */
 /* */
+/*       This source code is dual-licensed.  You may use it under the terms */
+/*       of the GNU General Public License version 2, or under the license  */
+/*       below.                                                             */
+/*                                                                          */
 /*       This source code has been made available to you by IBM on an AS-IS */
 /*       basis.  Anyone receiving this source is licensed under IBM */
 /*       copyrights to use it in any way he or she deems fit, including */

diff --git a/board/esd/pci405/writeibm.S b/board/esd/pci405/writeibm.S
index 9f5c35b5877c572e5c537e67dd043d24ffd794df..4e319c192aca2fb95fd6f03d977ba845fe65ca05 100644 (file)
--- a/board/esd/pci405/writeibm.S
+++ b/board/esd/pci405/writeibm.S
@@ -1,5 +1,9 @@
 /*------------------------------------------------------------------------------+ */
 /* */
+/*       This source code is dual-licensed.  You may use it under the terms */
+/*       of the GNU General Public License version 2, or under the license  */
+/*       below.                                                             */
+/*                                                                          */
 /*       This source code has been made available to you by IBM on an AS-IS */
 /*       basis.  Anyone receiving this source is licensed under IBM */
 /*       copyrights to use it in any way he or she deems fit, including */

diff --git a/board/exbitgen/init.S b/board/exbitgen/init.S
index 760835aab8e7c157fd4178bd8b900f484a380702..cb548746182270b59d298222d50b315415c24d6d 100644 (file)
--- a/board/exbitgen/init.S
+++ b/board/exbitgen/init.S
@@ -1,4 +1,6 @@
 /*----------------------------------------------------------------------+
+ *       This source code is dual-licensed.  You may use it under the terms of
+ *       the GNU General Public License version 2, or under the license below.
  *
  *       This source code has been made available to you by IBM on an AS-IS
  *       basis.  Anyone receiving this source is licensed under IBM

diff --git a/board/jse/init.S b/board/jse/init.S
index c564ed3c94ec36a28d2a3ccd43c53d3c19aa080b..7b932b25f0bc67ee4c4dc96adeaa8a32fde0255f 100644 (file)
--- a/board/jse/init.S
+++ b/board/jse/init.S
@@ -1,5 +1,9 @@
 /*------------------------------------------------------------------------+ */
 /* */
+/*       This source code is dual-licensed.  You may use it under the terms */
+/*       of the GNU General Public License version 2, or under the license  */
+/*       below.                                                             */
+/*                                                                          */
 /*       This source code has been made available to you by IBM on an AS-IS */
 /*       basis.  Anyone receiving this source is licensed under IBM */
 /*       copyrights to use it in any way he or she deems fit, including */

diff --git a/board/mpl/common/pci.c b/board/mpl/common/pci.c
index bfd642892ba26c65bf78e0496c8c3f95e3ed9f6b..e0ba620d1f98227db6c6c29df901653fa8135f90 100644 (file)
--- a/board/mpl/common/pci.c
+++ b/board/mpl/common/pci.c
@@ -1,4 +1,6 @@
 /*-----------------------------------------------------------------------------+
+|       This source code is dual-licensed.  You may use it under the terms of
+|       the GNU General Public License version 2, or under the license below.
 |
 |       This source code has been made available to you by IBM on an AS-IS
 |       basis.  Anyone receiving this source is licensed under IBM

diff --git a/board/mpl/mip405/init.S b/board/mpl/mip405/init.S
index f00a871dfd509b6901fa5cced5b6fb69fd58194f..19d92205112c8617d3a403baaf3eb94ea842107b 100644 (file)
--- a/board/mpl/mip405/init.S
+++ b/board/mpl/mip405/init.S
@@ -1,4 +1,6 @@
 /*------------------------------------------------------------------------------+
+ *      This source code is dual-licensed.  You may use it under the terms of
+ *      the GNU General Public License version 2, or under the license below.
  *
  *      This source code has been made available to you by IBM on an AS-IS
  *      basis.  Anyone receiving this source is licensed under IBM

diff --git a/board/mpl/pip405/init.S b/board/mpl/pip405/init.S
index 838432525dee57effa8f8d4709b7b6aaed99747e..61f37d74f2a42a725771d3618878d3013f772aee 100644 (file)
--- a/board/mpl/pip405/init.S
+++ b/board/mpl/pip405/init.S
@@ -1,4 +1,6 @@
 /*------------------------------------------------------------------------------+
+ *      This source code is dual-licensed.  You may use it under the terms of
+ *      the GNU General Public License version 2, or under the license below.
  *
  *      This source code has been made available to you by IBM on an AS-IS
  *      basis.  Anyone receiving this source is licensed under IBM

diff --git a/board/sc3/init.S b/board/sc3/init.S
index e7b3c839492a4c2c506eef6ee5713d4b8753e379..f97a5ea61049f79c238fcf039d597d03d5341b71 100644 (file)
--- a/board/sc3/init.S
+++ b/board/sc3/init.S
@@ -4,6 +4,9 @@
  *      (www.eurodsn.de). It's based on the original IBM source code, so
  *      this follows:
  *
+ *   This source code is dual-licensed.  You may use it under the terms of the
+ *   GNU General Public License version 2, or under the license below.
+ *
  *      This source code has been made available to you by IBM on an AS-IS
  *      basis.  Anyone receiving this source is licensed under IBM
  *      copyrights to use it in any way he or she deems fit, including

diff --git a/board/w7o/init.S b/board/w7o/init.S
index 2fd84ba0000029ed1ab9ba231ec24a333aaa4edb..902c6311374a4581a7b85493029606d8dc183642 100644 (file)
--- a/board/w7o/init.S
+++ b/board/w7o/init.S
@@ -1,4 +1,6 @@
 /******************************************************************************
+ *   This source code is dual-licensed.  You may use it under the terms of the
+ *   GNU General Public License version 2, or under the license below.
  *
  *      This source code has been made available to you by IBM on an AS-IS
  *      basis.  Anyone receiving this source is licensed under IBM

diff --git a/cpu/i386/serial.c b/cpu/i386/serial.c
index 8b5f8fa1176097fa36e68ac9a61e873e5e543ce5..e7025a3cdc051a51bf38c3a9418620ec598c4542 100644 (file)
--- a/cpu/i386/serial.c
+++ b/cpu/i386/serial.c
@@ -26,6 +26,9 @@
 /*------------------------------------------------------------------------------+ */
 
 /*
+ * This source code is dual-licensed.  You may use it under the terms of the
+ * GNU General Public License version 2, or under the license below.
+ *
  * This source code has been made available to you by IBM on an AS-IS
  * basis.  Anyone receiving this source is licensed under IBM
  * copyrights to use it in any way he or she deems fit, including

diff --git a/cpu/ixp/npe/miiphy.c b/cpu/ixp/npe/miiphy.c
index 20fee2d39cc48610e2d1543da5d2dd852d0a9cbd..b208c51eae86aa0fb7dc94bb0b62b032e5a8a803 100644 (file)
--- a/cpu/ixp/npe/miiphy.c
+++ b/cpu/ixp/npe/miiphy.c
@@ -1,4 +1,6 @@
 /*-----------------------------------------------------------------------------+
+  |   This source code is dual-licensed.  You may use it under the terms of the
+  |   GNU General Public License version 2, or under the license below.
   |
   |      This source code has been made available to you by IBM on an AS-IS
   |      basis.  Anyone receiving this source is licensed under IBM

diff --git a/cpu/ppc4xx/4xx_pci.c b/cpu/ppc4xx/4xx_pci.c
index 4b5d636bd199b8e99fd96d407662c605e7044c5d..5d7d59c0ea021759a2252ae86c1801d9bed180fe 100644 (file)
--- a/cpu/ppc4xx/4xx_pci.c
+++ b/cpu/ppc4xx/4xx_pci.c
@@ -1,4 +1,6 @@
 /*-----------------------------------------------------------------------------+
+ *       This source code is dual-licensed.  You may use it under the terms of
+ *       the GNU General Public license version 2, or under the license below.
  *
  *       This source code has been made available to you by IBM on an AS-IS
  *       basis.  Anyone receiving this source is licensed under IBM

diff --git a/cpu/ppc4xx/4xx_uart.c b/cpu/ppc4xx/4xx_uart.c
index c106ac223cbaf9c68a8565505689f93d172ab135..0780624e4a070e7fc4996f644047092d7e252e06 100644 (file)
--- a/cpu/ppc4xx/4xx_uart.c
+++ b/cpu/ppc4xx/4xx_uart.c
@@ -22,6 +22,9 @@
  */
 
 /*
+ * This source code is dual-licensed.  You may use it under the terms of the
+ * GNU General Public License version 2, or under the license below.
+ *
  * This source code has been made available to you by IBM on an AS-IS
  * basis.  Anyone receiving this source is licensed under IBM
  * copyrights to use it in any way he or she deems fit, including

diff --git a/cpu/ppc4xx/miiphy.c b/cpu/ppc4xx/miiphy.c
index 01710e71dd9b8fa32cdcba0c3deeeb1386d18ce6..6a92bf83648e77b2612bd93cc8d7641fc9bfd110 100644 (file)
--- a/cpu/ppc4xx/miiphy.c
+++ b/cpu/ppc4xx/miiphy.c
@@ -1,4 +1,6 @@
 /*-----------------------------------------------------------------------------+
+  |   This source code is dual-licensed.  You may use it under the terms of the
+  |   GNU General Public License version 2, or under the license below.
   |
   |      This source code has been made available to you by IBM on an AS-IS
   |      basis.  Anyone receiving this source is licensed under IBM

diff --git a/cpu/ppc4xx/start.S b/cpu/ppc4xx/start.S
index 60756c3dfbf84e27b8a1d237124d8e90adc9b654..f967d8464cf74d567e2301300d99bd9ef3f12201 100644 (file)
--- a/cpu/ppc4xx/start.S
+++ b/cpu/ppc4xx/start.S
@@ -25,6 +25,8 @@
  * MA 02111-1307 USA
  */
 /*------------------------------------------------------------------------------+
+ *   This source code is dual-licensed.  You may use it under the terms of the
+ *   GNU General Public License version 2, or under the license below.
  *
  *      This source code has been made available to you by IBM on an AS-IS
  *      basis.  Anyone receiving this source is licensed under IBM

diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
index c0200481c62cdd2fac1bf197663a1a68fd8aa848..329eef07df51e8f50e48759b1740e91b5d07610b 100644 (file)
--- a/drivers/net/4xx_enet.c
+++ b/drivers/net/4xx_enet.c
@@ -1,4 +1,6 @@
 /*-----------------------------------------------------------------------------+
+ *   This source code is dual-licensed.  You may use it under the terms of the
+ *   GNU General Public License version 2, or under the license below.
  *
  *      This source code has been made available to you by IBM on an AS-IS
  *      basis.  Anyone receiving this source is licensed under IBM

diff --git a/include/405_mal.h b/include/405_mal.h
index 1415cbe1bcc8411d4678a3c18de321392071ee86..1ca9429e23447a049225e2c14c093fc5a7312ace 100644 (file)
--- a/include/405_mal.h
+++ b/include/405_mal.h
@@ -1,5 +1,7 @@
 /* include/mal.h, openbios_walnut, walnut_bios 8/6/99 08:48:40 */
 /*----------------------------------------------------------------------------+
+|   This source code is dual-licensed.  You may use it under the terms of the
+|   GNU General Public License version 2, or under the license below.
 |
 |      This source code has been made available to you by IBM on an AS-IS
 |      basis.  Anyone receiving this source is licensed under IBM

diff --git a/include/miiphy.h b/include/miiphy.h
index 32f0a6140849510998f444e502dd6ae3477cc725..fa33ec7f71d5a70b053f383534805db896e8ea3d 100644 (file)
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -1,4 +1,6 @@
 /*----------------------------------------------------------------------------+
+|   This source code is dual-licensed.  You may use it under the terms of the
+|   GNU General Public License version 2, or under the license below.
 |
 |      This source code has been made available to you by IBM on an AS-IS
 |      basis.  Anyone receiving this source is licensed under IBM

diff --git a/include/ppc405.h b/include/ppc405.h
index a17dd359505fb5d400126cfbcef1f4b1d1b6cd01..55649e474fc74c43f9ecddc600bab8b895704fa2 100644 (file)
--- a/include/ppc405.h
+++ b/include/ppc405.h
@@ -1,4 +1,6 @@
 /*----------------------------------------------------------------------------+
+|   This source code is dual-licensed.  You may use it under the terms of the
+|   GNU General Public License version 2, or under the license below.
 |
 |      This source code has been made available to you by IBM on an AS-IS
 |      basis.  Anyone receiving this source is licensed under IBM

diff --git a/include/ppc440.h b/include/ppc440.h
index e6dc7406f48fc92c642954f33b85fb5429a1ca3c..7f34fda8cfa3d0c0f0feb8f2925ce31d2bcfc8d9 100644 (file)
--- a/include/ppc440.h
+++ b/include/ppc440.h
@@ -1,4 +1,6 @@
 /*----------------------------------------------------------------------------+
+|   This source code is dual-licensed.  You may use it under the terms of the
+|   GNU General Public License version 2, or under the license below.
 |
 |      This source code has been made available to you by IBM on an AS-IS
 |      basis.  Anyone receiving this source is licensed under IBM

diff --git a/include/ppc4xx.h b/include/ppc4xx.h
index 55ff32353a1091d7d70fe8b94b9c856dfe3d44ea..a9954aa3de33f70643462358aa42505a92379b30 100644 (file)
--- a/include/ppc4xx.h
+++ b/include/ppc4xx.h
@@ -1,4 +1,6 @@
 /*----------------------------------------------------------------------------+
+|       This source code is dual-licensed.  You may use it under the terms of
+|       the GNU General Public License version 2, or under the license below.
 |
 |       This source code has been made available to you by IBM on an AS-IS
 |       basis.  Anyone receiving this source is licensed under IBM

diff --git a/include/ppc4xx_enet.h b/include/ppc4xx_enet.h
index 3e10883f984ab8bcdea241a3a80b493d50308c15..7588e93cebcbede8dbca7acb51669efd3f682fd2 100644 (file)
--- a/include/ppc4xx_enet.h
+++ b/include/ppc4xx_enet.h
@@ -1,4 +1,6 @@
 /*----------------------------------------------------------------------------+
+|   This source code is dual-licensed.  You may use it under the terms of the
+|   GNU General Public License version 2, or under the license below.
 |
 |      This source code has been made available to you by IBM on an AS-IS
 |      basis.  Anyone receiving this source is licensed under IBM