| Message ID | 1345526833-10804-13-git-send-email-lliubbo@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Mike Frysinger |
| Headers | show |
Dear Bob Liu, In message <1345526833-10804-13-git-send-email-lliubbo@gmail.com> you wrote: > > Per the request from ADI Legal. > > Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> > Signed-off-by: Bob Liu <lliubbo@gmail.com> > --- > arch/blackfin/Clear_BSD.txt | 33 ++++++++++++++++++++++++ > arch/blackfin/cpu/bootcount.c | 2 +- > arch/blackfin/cpu/os_log.c | 2 +- > arch/blackfin/include/asm/mach-bf506/anomaly.h | 3 +-- > arch/blackfin/include/asm/mach-bf518/anomaly.h | 3 +-- > arch/blackfin/include/asm/mach-bf527/anomaly.h | 3 +-- > arch/blackfin/include/asm/mach-bf533/anomaly.h | 3 +-- > arch/blackfin/include/asm/mach-bf537/anomaly.h | 3 +-- > arch/blackfin/include/asm/mach-bf538/anomaly.h | 3 +-- > arch/blackfin/include/asm/mach-bf548/anomaly.h | 3 +-- > arch/blackfin/include/asm/mach-bf561/anomaly.h | 3 +-- > arch/blackfin/include/asm/mach-bf609/anomaly.h | 3 +-- > 12 files changed, 44 insertions(+), 20 deletions(-) > create mode 100644 arch/blackfin/Clear_BSD.txt > > diff --git a/arch/blackfin/Clear_BSD.txt b/arch/blackfin/Clear_BSD.txt > new file mode 100644 > index 0000000..bfa4b37 > --- /dev/null > +++ b/arch/blackfin/Clear_BSD.txt > @@ -0,0 +1,33 @@ > +The Clear BSD license: > + > +Copyright (c) 2012, Analog Devices, Inc. All rights reserved. > + > +Redistribution and use in source and binary forms, with or without > +modification, are permitted (subject to the limitations in the > +disclaimer below) provided that the following conditions are met: > + > +* Redistributions of source code must retain the above copyright > + notice, this list of conditions and the following disclaimer. > + > +* Redistributions in binary form must reproduce the above copyright > + notice, this list of conditions and the following disclaimer in the > + documentation and/or other materials provided with the > + distribution. > + > +* Neither the name of Analog Devices, Inc. nor the names of its > + contributors may be used to endorse or promote products derived > + from this software without specific prior written permission. It's not at all clear to me to which file this license is supposed to apply. Also, are you absolutely sure that this is GPL compatible?? In any case, please squash this patch with the other parts of this series. It's a bad idea to knowingly add incorrect stuff and fix it only later. Best regards, Wolfgang Denk
Dear Bob Liu, In message <1345526833-10804-13-git-send-email-lliubbo@gmail.com> you wrote: > From: Sonic Zhang <sonic.zhang@analog.com> > > Per the request from ADI Legal. ... > --- /dev/null > +++ b/arch/blackfin/Clear_BSD.txt > @@ -0,0 +1,33 @@ > +The Clear BSD license: > + > +Copyright (c) 2012, Analog Devices, Inc. All rights reserved. > + > +Redistribution and use in source and binary forms, with or without > +modification, are permitted (subject to the limitations in the > +disclaimer below) provided that the following conditions are met: > + > +* Redistributions of source code must retain the above copyright > + notice, this list of conditions and the following disclaimer. > + > +* Redistributions in binary form must reproduce the above copyright > + notice, this list of conditions and the following disclaimer in the > + documentation and/or other materials provided with the > + distribution. > + > +* Neither the name of Analog Devices, Inc. nor the names of its > + contributors may be used to endorse or promote products derived > + from this software without specific prior written permission. > + > +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE > +GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT > +HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED > +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE > +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE > +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, > +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE > +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN > +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Ok. After reading the explanations http://www.gnu.org/licenses/license-list.html#clearbsd I hereby reject this code. I'm not willing to accept even the theoretical risk that Analog Devices might fancy to sue any party involved with U-Boot development or use for patent infringement. [The fact that you bother to chose this specific lincense form suggests that such a thread might exist.] Sorry. Best regards, Wolfgang Denk
Dear "Zhang, Sonic", In message <DB904C5425BA6F4E8424B3B51A1414D1714EE63B58@NWD2CMBX1.ad.analog.com> you wrote: > ... > This license only applies to the anomaly head files and register address head files for Blackfin. All the other files are still under GPL. Given the lurking patent issues with this license I'm not going to accept this. Best regards, Wolfgang Denk
diff --git a/arch/blackfin/Clear_BSD.txt b/arch/blackfin/Clear_BSD.txt new file mode 100644 index 0000000..bfa4b37 --- /dev/null +++ b/arch/blackfin/Clear_BSD.txt @@ -0,0 +1,33 @@ +The Clear BSD license: + +Copyright (c) 2012, Analog Devices, Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted (subject to the limitations in the +disclaimer below) provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the + distribution. + +* Neither the name of Analog Devices, Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE +GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT +HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/arch/blackfin/cpu/bootcount.c b/arch/blackfin/cpu/bootcount.c index 6cf6dd5..83e8546 100644 --- a/arch/blackfin/cpu/bootcount.c +++ b/arch/blackfin/cpu/bootcount.c @@ -3,7 +3,7 @@ * * Copyright (c) 2010 Analog Devices Inc. * - * Licensed under the 2-clause BSD. + * Licensed under the Clear BSD. */ /* This version uses one 32bit storage and combines the magic/count */ diff --git a/arch/blackfin/cpu/os_log.c b/arch/blackfin/cpu/os_log.c index e1c8e29..51501f7 100644 --- a/arch/blackfin/cpu/os_log.c +++ b/arch/blackfin/cpu/os_log.c @@ -3,7 +3,7 @@ * * Copyright (c) 2009 Analog Devices Inc. * - * Licensed under the 2-clause BSD. + * Licensed under the Clear BSD. */ #include <common.h> diff --git a/arch/blackfin/include/asm/mach-bf506/anomaly.h b/arch/blackfin/include/asm/mach-bf506/anomaly.h index 5b3227a..00d5e43 100644 --- a/arch/blackfin/include/asm/mach-bf506/anomaly.h +++ b/arch/blackfin/include/asm/mach-bf506/anomaly.h @@ -6,8 +6,7 @@ * DO NOT EDIT THIS FILE * * Copyright 2004-2011 Analog Devices Inc. - * Licensed under the ADI BSD license. - * https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd + * Licensed under the Clear BSD license. */ /* This file should be up to date with: diff --git a/arch/blackfin/include/asm/mach-bf518/anomaly.h b/arch/blackfin/include/asm/mach-bf518/anomaly.h index 56383f7..845e6bc 100644 --- a/arch/blackfin/include/asm/mach-bf518/anomaly.h +++ b/arch/blackfin/include/asm/mach-bf518/anomaly.h @@ -6,8 +6,7 @@ * DO NOT EDIT THIS FILE * * Copyright 2004-2011 Analog Devices Inc. - * Licensed under the ADI BSD license. - * https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd + * Licensed under the Clear BSD license. */ /* This file should be up to date with: diff --git a/arch/blackfin/include/asm/mach-bf527/anomaly.h b/arch/blackfin/include/asm/mach-bf527/anomaly.h index 6884706..aa14110 100644 --- a/arch/blackfin/include/asm/mach-bf527/anomaly.h +++ b/arch/blackfin/include/asm/mach-bf527/anomaly.h @@ -6,8 +6,7 @@ * DO NOT EDIT THIS FILE * * Copyright 2004-2011 Analog Devices Inc. - * Licensed under the ADI BSD license. - * https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd + * Licensed under the Clear BSD license. */ /* This file should be up to date with: diff --git a/arch/blackfin/include/asm/mach-bf533/anomaly.h b/arch/blackfin/include/asm/mach-bf533/anomaly.h index 03f2b40..3a8f73a 100644 --- a/arch/blackfin/include/asm/mach-bf533/anomaly.h +++ b/arch/blackfin/include/asm/mach-bf533/anomaly.h @@ -6,8 +6,7 @@ * DO NOT EDIT THIS FILE * * Copyright 2004-2011 Analog Devices Inc. - * Licensed under the ADI BSD license. - * https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd + * Licensed under the Clear BSD license. */ /* This file should be up to date with: diff --git a/arch/blackfin/include/asm/mach-bf537/anomaly.h b/arch/blackfin/include/asm/mach-bf537/anomaly.h index 543cd3f..df92126 100644 --- a/arch/blackfin/include/asm/mach-bf537/anomaly.h +++ b/arch/blackfin/include/asm/mach-bf537/anomaly.h @@ -6,8 +6,7 @@ * DO NOT EDIT THIS FILE * * Copyright 2004-2011 Analog Devices Inc. - * Licensed under the ADI BSD license. - * https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd + * Licensed under the Clear BSD license. */ /* This file should be up to date with: diff --git a/arch/blackfin/include/asm/mach-bf538/anomaly.h b/arch/blackfin/include/asm/mach-bf538/anomaly.h index b6ca997..318d922 100644 --- a/arch/blackfin/include/asm/mach-bf538/anomaly.h +++ b/arch/blackfin/include/asm/mach-bf538/anomaly.h @@ -6,8 +6,7 @@ * DO NOT EDIT THIS FILE * * Copyright 2004-2011 Analog Devices Inc. - * Licensed under the ADI BSD license. - * https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd + * Licensed under the Clear BSD license. */ /* This file should be up to date with: diff --git a/arch/blackfin/include/asm/mach-bf548/anomaly.h b/arch/blackfin/include/asm/mach-bf548/anomaly.h index 021fb19..874eac1 100644 --- a/arch/blackfin/include/asm/mach-bf548/anomaly.h +++ b/arch/blackfin/include/asm/mach-bf548/anomaly.h @@ -6,8 +6,7 @@ * DO NOT EDIT THIS FILE * * Copyright 2004-2011 Analog Devices Inc. - * Licensed under the ADI BSD license. - * https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd + * Licensed under the Clear BSD license. */ /* This file should be up to date with: diff --git a/arch/blackfin/include/asm/mach-bf561/anomaly.h b/arch/blackfin/include/asm/mach-bf561/anomaly.h index b27173c..01c26f9 100644 --- a/arch/blackfin/include/asm/mach-bf561/anomaly.h +++ b/arch/blackfin/include/asm/mach-bf561/anomaly.h @@ -6,8 +6,7 @@ * DO NOT EDIT THIS FILE * * Copyright 2004-2011 Analog Devices Inc. - * Licensed under the ADI BSD license. - * https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd + * Licensed under the Clear BSD license. */ /* This file should be up to date with: diff --git a/arch/blackfin/include/asm/mach-bf609/anomaly.h b/arch/blackfin/include/asm/mach-bf609/anomaly.h index cfe1a1d..1b8227f 100644 --- a/arch/blackfin/include/asm/mach-bf609/anomaly.h +++ b/arch/blackfin/include/asm/mach-bf609/anomaly.h @@ -6,8 +6,7 @@ * DO NOT EDIT THIS FILE * * Copyright 2004-2010 Analog Devices Inc. - * Licensed under the ADI BSD license. - * https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd + * Licensed under the Clear BSD license. */ /* This file should be up to date with: