Reformat copyright/license header in files with an SPDX ID

Some files were committed with an SPDX license identifier before the rules were defined [1]. Reformat them accordingly. [1] documentation/copyright_and_license_headers.rst Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Acked-by: Joakim Bech <joakim.bech@linaro.org>
jenswi-linaro · Jan 10, 2018 · fb7ef46 · fb7ef46
1 parent 537ee74
commit fb7ef46
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 76 deletions.
diff --git a/core/arch/arm/crypto/aes-gcm-ce.c b/core/arch/arm/crypto/aes-gcm-ce.c
@@ -1,8 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <crypto/internal_aes-gcm.h>

diff --git a/core/arch/arm/crypto/ghash-ce-core_a32.S b/core/arch/arm/crypto/ghash-ce-core_a32.S
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Accelerated GHASH implementation with ARMv8 PMULL instructions.
  *
  * Copyright (C) 2014 - 2017 Linaro Ltd. <ard.biesheuvel@linaro.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <arm32_macros.S>

diff --git a/core/arch/arm/crypto/ghash-ce-core_a64.S b/core/arch/arm/crypto/ghash-ce-core_a64.S
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Accelerated GHASH implementation with ARMv8 PMULL instructions.
  *
  * Copyright (C) 2014 - 2017 Linaro Ltd. <ard.biesheuvel@linaro.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <arm64_macros.S>

diff --git a/core/arch/arm/include/crypto/ghash-ce-core.h b/core/arch/arm/include/crypto/ghash-ce-core.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __GHASH_CE_CORE_H

diff --git a/core/arch/arm/kernel/secstor_ta.c b/core/arch/arm/kernel/secstor_ta.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <tee/tadb.h>

diff --git a/core/arch/arm/pta/core_mutex_tests.c b/core/arch/arm/pta/core_mutex_tests.c
@@ -1,8 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <atomic.h>

diff --git a/core/arch/arm/pta/secstor_ta_mgmt.c b/core/arch/arm/pta/secstor_ta_mgmt.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <kernel/pseudo_ta.h>

diff --git a/core/crypto/aes-gcm-ghash-tbl.c b/core/crypto/aes-gcm-ghash-tbl.c
@@ -1,8 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
 /*
  *  NIST SP800-38D compliant GCM implementation
  *
  *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
- *  SPDX-License-Identifier: Apache-2.0
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may
  *  not use this file except in compliance with the License.

diff --git a/core/crypto/aes-gcm-private.h b/core/crypto/aes-gcm-private.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <crypto/internal_aes-gcm.h>

diff --git a/core/crypto/aes-gcm-sw.c b/core/crypto/aes-gcm-sw.c
@@ -1,8 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <assert.h>

diff --git a/core/crypto/aes-gcm.c b/core/crypto/aes-gcm.c
@@ -1,8 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <assert.h>

diff --git a/core/crypto/crypto.c b/core/crypto/crypto.c
@@ -1,8 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <compiler.h>

diff --git a/core/crypto/signed_hdr.c b/core/crypto/signed_hdr.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2015-2017, Linaro Limited
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <crypto/crypto.h>

diff --git a/core/include/crypto/aes-ccm.h b/core/include/crypto/aes-ccm.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __CRYPTO_AES_CCM_H

diff --git a/core/include/crypto/aes-gcm.h b/core/include/crypto/aes-gcm.h
@@ -1,8 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __CRYPTO_AES_GCM_H

diff --git a/core/include/crypto/internal_aes-gcm.h b/core/include/crypto/internal_aes-gcm.h
@@ -1,8 +1,8 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2017, Linaro Limited
  * All rights reserved.
  *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __CRYPTO_INTERNAL_AES_GCM_H

diff --git a/core/include/kernel/refcount.h b/core/include/kernel/refcount.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2017, Linaro Limited
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __KERNEL_REFCOUNT_H

diff --git a/core/include/tee/tadb.h b/core/include/tee/tadb.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2017, Linaro Limited
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __TEE_TADB_H

diff --git a/core/kernel/refcount.c b/core/kernel/refcount.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <assert.h>

diff --git a/core/lib/libtomcrypt/src/encauth/gcm/gcm_mult_h_arm_ce.c b/core/lib/libtomcrypt/src/encauth/gcm/gcm_mult_h_arm_ce.c
@@ -1,8 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <crypto/ghash-ce-core.h>

diff --git a/core/tee/tadb.c b/core/tee/tadb.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2017, Linaro Limited
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <bitstring.h>

diff --git a/lib/libutee/include/pta_secstor_ta_mgmt.h b/lib/libutee/include/pta_secstor_ta_mgmt.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2017, Linaro Limited
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __PTA_SECSTOR_TA_MGMT_H

diff --git a/lib/libutils/ext/include/atomic.h b/lib/libutils/ext/include/atomic.h
@@ -1,29 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2016-2017, Linaro Limited
- *
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * 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 HOLDER 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.
  */
 
 #ifndef __ATOMIC_H