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 | |
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>
-rw-r--r-- | board/cray/L1/init.S | 4 | ||||
-rw-r--r-- | board/csb272/init.S | 2 | ||||
-rw-r--r-- | board/csb472/init.S | 2 | ||||
-rw-r--r-- | board/eric/init.S | 4 | ||||
-rw-r--r-- | board/esd/pci405/writeibm.S | 4 | ||||
-rw-r--r-- | board/exbitgen/init.S | 2 | ||||
-rw-r--r-- | board/jse/init.S | 4 | ||||
-rw-r--r-- | board/mpl/common/pci.c | 2 | ||||
-rw-r--r-- | board/mpl/mip405/init.S | 2 | ||||
-rw-r--r-- | board/mpl/pip405/init.S | 2 | ||||
-rw-r--r-- | board/sc3/init.S | 3 | ||||
-rw-r--r-- | board/w7o/init.S | 2 | ||||
-rw-r--r-- | cpu/i386/serial.c | 3 | ||||
-rw-r--r-- | cpu/ixp/npe/miiphy.c | 2 | ||||
-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 | ||||
-rw-r--r-- | drivers/net/4xx_enet.c | 2 | ||||
-rw-r--r-- | include/405_mal.h | 2 | ||||
-rw-r--r-- | include/miiphy.h | 2 | ||||
-rw-r--r-- | include/ppc405.h | 2 | ||||
-rw-r--r-- | include/ppc440.h | 2 | ||||
-rw-r--r-- | include/ppc4xx.h | 2 | ||||
-rw-r--r-- | include/ppc4xx_enet.h | 2 |
25 files changed, 61 insertions, 0 deletions
diff --git a/board/cray/L1/init.S b/board/cray/L1/init.S index 4b6b3f4003..d700ea76cf 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 ab371f20d4..1cfef376a6 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 4b6958aefc..2cf8afc499 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 2304cc7bbe..4820dd08c7 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 9f5c35b587..4e319c192a 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 760835aab8..cb54874618 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 c564ed3c94..7b932b25f0 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 bfd642892b..e0ba620d1f 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 f00a871dfd..19d9220511 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 838432525d..61f37d74f2 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 e7b3c83949..f97a5ea610 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 2fd84ba000..902c631137 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 diff --git a/cpu/i386/serial.c b/cpu/i386/serial.c index 8b5f8fa117..e7025a3cdc 100644 --- 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 20fee2d39c..b208c51eae 100644 --- 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 4b5d636bd1..5d7d59c0ea 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 c106ac223c..0780624e4a 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 01710e71dd..6a92bf8364 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 60756c3dfb..f967d8464c 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 diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index c0200481c6..329eef07df 100644 --- 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 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 |