summaryrefslogtreecommitdiff
path: root/include
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 /include
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 'include')
-rw-r--r--include/405_mal.h2
-rw-r--r--include/miiphy.h2
-rw-r--r--include/ppc405.h2
-rw-r--r--include/ppc440.h2
-rw-r--r--include/ppc4xx.h2
-rw-r--r--include/ppc4xx_enet.h2
6 files changed, 12 insertions, 0 deletions
diff --git a/include/405_mal.h b/include/405_mal.h
index 1415cbe1bc..1ca9429e23 100644
--- 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 32f0a61408..fa33ec7f71 100644
--- 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 a17dd35950..55649e474f 100644
--- 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 e6dc7406f4..7f34fda8cf 100644
--- 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 55ff32353a..a9954aa3de 100644
--- 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 3e10883f98..7588e93ceb 100644
--- 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