summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2009-08-07 13:53:20 -0400
committerWolfgang Denk <wd@denx.de>2009-08-09 23:15:33 +0200
commit317734966e763fdee183898c0ed940c9bada2541 (patch)
tree8da04c0a2bb33b1c9225cb1129e42e01ad56a907 /board
parentcfd700be9f5ed289fd57a9bd61e266319badcb0d (diff)
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>
Diffstat (limited to 'board')
-rw-r--r--board/cray/L1/init.S4
-rw-r--r--board/csb272/init.S2
-rw-r--r--board/csb472/init.S2
-rw-r--r--board/eric/init.S4
-rw-r--r--board/esd/pci405/writeibm.S4
-rw-r--r--board/exbitgen/init.S2
-rw-r--r--board/jse/init.S4
-rw-r--r--board/mpl/common/pci.c2
-rw-r--r--board/mpl/mip405/init.S2
-rw-r--r--board/mpl/pip405/init.S2
-rw-r--r--board/sc3/init.S3
-rw-r--r--board/w7o/init.S2
12 files changed, 33 insertions, 0 deletions
diff --git a/board/cray/L1/init.S b/board/cray/L1/init.S
index 4b6b3f40030..d700ea76cf3 100644
--- 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 ab371f20d4b..1cfef376a69 100644
--- 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 4b6958aefc0..2cf8afc4994 100644
--- 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 2304cc7bbe6..4820dd08c7f 100644
--- 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 9f5c35b5877..4e319c192ac 100644
--- 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 760835aab8e..cb548746182 100644
--- 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 c564ed3c94e..7b932b25f0b 100644
--- 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 bfd642892ba..e0ba620d1f9 100644
--- 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 f00a871dfd5..19d92205112 100644
--- 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 838432525de..61f37d74f2a 100644
--- 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 e7b3c839492..f97a5ea6104 100644
--- 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 2fd84ba0000..902c6311374 100644
--- 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