Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de450838 authored by Sonic Zhang's avatar Sonic Zhang Committed by Bob Liu
Browse files

blackfin: license: Change ADI BSD license 



Change ADI BSD license to standart 3 clause BSD license for some blackfin arch
code requested by ADI Legal.

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
parent 8c998b2a

arch/blackfin/ADI_BSD.txt

deleted100644 → 0
+0 −41
Original line number Original line Diff line number Diff line 
This BSD-Style License applies to a few files in ./arch/blackfin directory,

and is included here, so people understand which code they can use outside

the Linux kernel, in non-GPL based projects.



Using the files released under the "ADI BSD" license, must comply with

these license terms.



--------------------------------------------------------------------------



Copyright Analog Devices, Inc.



All rights reserved.



Redistribution and use in source and binary forms, with or without

modification, are permitted 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.

  - The use of this software may or may not infringe the patent rights

    of one or more patent holders.  This license does not release you

    from the requirement that you obtain separate licenses from these

    patent holders to use this software.



THIS SOFTWARE IS PROVIDED BY ANALOG DEVICES "AS IS" AND ANY EXPRESS OR

IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, NON-INFRINGEMENT,

MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

IN NO EVENT SHALL ANALOG DEVICES BE LIABLE FOR ANY DIRECT, INDIRECT,

INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

BUT NOT LIMITED TO, INTELLECTUAL PROPERTY RIGHTS, 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

arch/blackfin/Clear_BSD.txt

0 → 100644
+33 −0
Original line number Original line Diff line number Diff line 
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.

arch/blackfin/include/asm/bfin_pfmon.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 *

 * Copyright 2005-2011 Analog Devices Inc.

 * Copyright 2005-2011 Analog Devices Inc.

 *

 *

 * Licensed under the ADI BSD license or GPL-2 (or later).

 * Licensed under the Clear BSD license or GPL-2 (or later).

 */

 */





#ifndef __ASM_BFIN_PFMON_H__

#ifndef __ASM_BFIN_PFMON_H__

arch/blackfin/include/asm/def_LPBlackfin.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 *

 * Copyright 2005-2008 Analog Devices Inc.

 * Copyright 2005-2008 Analog Devices Inc.

 *

 *

 * Licensed under the ADI BSD license or GPL-2 (or later).

 * Licensed under the Clear BSD license or GPL-2 (or later).

 */

 */





#ifndef _DEF_LPBLACKFIN_H

#ifndef _DEF_LPBLACKFIN_H

arch/blackfin/lib/divsi3.S

+1 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright 2004-2009 Analog Devices Inc.

 * Copyright 2004-2009 Analog Devices Inc.

 *

 *

 * Licensed under the ADI BSD license or the GPL-2 (or later)

 * Licensed under the Clear BSD license or the GPL-2 (or later)

 *

 *

 * 16 / 32 bit signed division.

 * 16 / 32 bit signed division.

 *                 Special cases :

 *                 Special cases :