From: Sonic Zhang sonic.zh...@analog.com
Per the request from ADI Legal.
Signed-off-by: Sonic Zhang sonic.zh...@analog.com
Signed-off-by: Bob Liu lliu...@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 000..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.
- *