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 4b6b3f4..d700ea7 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 ab371f2..1cfef37 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 4b6958a..2cf8afc 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 2304cc7..4820dd0 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 9f5c35b..4e319c1 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 760835a..cb54874 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 c564ed3..7b932b2 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 bfd6428..e0ba620 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 f00a871..19d9220 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 8384325..61f37d7 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 e7b3c83..f97a5ea 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 2fd84ba..902c631 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 8b5f8fa..e7025a3 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 20fee2d..b208c51 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 4b5d636..5d7d59c 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 c106ac2..0780624 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 01710e7..6a92bf8 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 60756c3..f967d84 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 c020048..329eef0 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 1415cbe..1ca9429 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 32f0a61..fa33ec7 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 a17dd35..55649e4 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 e6dc740..7f34fda 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 55ff323..a9954aa 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 3e10883..7588e93 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