diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2009-08-07 13:53:20 -0400 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-08-09 23:15:33 +0200 |
| commit | 317734966e763fdee183898c0ed940c9bada2541 (patch) | |
| tree | 8da04c0a2bb33b1c9225cb1129e42e01ad56a907 /cpu/ppc4xx | |
| parent | cfd700be9f5ed289fd57a9bd61e266319badcb0d (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 'cpu/ppc4xx')
| -rw-r--r-- | cpu/ppc4xx/4xx_pci.c | 2 | ||||
| -rw-r--r-- | cpu/ppc4xx/4xx_uart.c | 3 | ||||
| -rw-r--r-- | cpu/ppc4xx/miiphy.c | 2 | ||||
| -rw-r--r-- | cpu/ppc4xx/start.S | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/cpu/ppc4xx/4xx_pci.c b/cpu/ppc4xx/4xx_pci.c index 4b5d636bd..5d7d59c0e 100644 --- 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 c106ac223..0780624e4 100644 --- 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 01710e71d..6a92bf836 100644 --- 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 60756c3df..f967d8464 100644 --- 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 |