diff options
author | Tom Rini <trini@konsulko.com> | 2018-05-06 17:58:06 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-05-07 09:34:12 -0400 |
commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /arch/riscv/include/asm | |
parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) |
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and
there weren't a lot of other examples to borrow from. So we picked the
area of the file that usually had a full license text and replaced it
with an appropriate SPDX-License-Identifier: entry. Since then, the
Linux Kernel has adopted SPDX tags and they place it as the very first
line in a file (except where shebangs are used, then it's second line)
and with slightly different comment styles than us.
In part due to community overlap, in part due to better tag visibility
and in part for other minor reasons, switch over to that style.
This commit changes all instances where we have a single declared
license in the tag as both the before and after are identical in tag
contents. There's also a few places where I found we did not have a tag
and have introduced one.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/riscv/include/asm')
-rw-r--r-- | arch/riscv/include/asm/bootm.h | 5 | ||||
-rw-r--r-- | arch/riscv/include/asm/cache.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/config.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/encoding.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/global_data.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/io.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/linkage.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/mach-types.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/sections.h | 2 | ||||
-rw-r--r-- | arch/riscv/include/asm/setup.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/system.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/u-boot-riscv.h | 3 | ||||
-rw-r--r-- | arch/riscv/include/asm/u-boot.h | 3 |
13 files changed, 13 insertions, 27 deletions
diff --git a/arch/riscv/include/asm/bootm.h b/arch/riscv/include/asm/bootm.h index 9a90f23a22..67863458ec 100644 --- a/arch/riscv/include/asm/bootm.h +++ b/arch/riscv/include/asm/bootm.h @@ -1,12 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2013, Google Inc. * * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de> - * - * SPDX-License-Identifier: GPL-2.0+ - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef NDS32_BOOTM_H #define NDS32_BOOTM_H diff --git a/arch/riscv/include/asm/cache.h b/arch/riscv/include/asm/cache.h index facf0720aa..ca83dd67c2 100644 --- a/arch/riscv/include/asm/cache.h +++ b/arch/riscv/include/asm/cache.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick@andestech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_RISCV_CACHE_H diff --git a/arch/riscv/include/asm/config.h b/arch/riscv/include/asm/config.h index 5f94eb02e2..81bc975d2e 100644 --- a/arch/riscv/include/asm/config.h +++ b/arch/riscv/include/asm/config.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick@andestech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CONFIG_H_ diff --git a/arch/riscv/include/asm/encoding.h b/arch/riscv/include/asm/encoding.h index dbf8d45fb7..f237a72f06 100644 --- a/arch/riscv/include/asm/encoding.h +++ b/arch/riscv/include/asm/encoding.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2017 Microsemi Corporation. * Padmarao Begari, Microsemi Corporation <padmarao.begari@microsemi.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef RISCV_CSR_ENCODING_H diff --git a/arch/riscv/include/asm/global_data.h b/arch/riscv/include/asm/global_data.h index bd352c2cda..4d5d623725 100644 --- a/arch/riscv/include/asm/global_data.h +++ b/arch/riscv/include/asm/global_data.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * Copyright (c) 2017 Microsemi Corporation. * Padmarao Begari, Microsemi Corporation <padmarao.begari@microsemi.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_GBL_DATA_H diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h index 1df6b1b2bf..f4a76d8720 100644 --- a/arch/riscv/include/asm/io.h +++ b/arch/riscv/include/asm/io.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick@andestech.com> * - * SPDX-License-Identifier: GPL-2.0 - * */ #ifndef __ASM_RISCV_IO_H #define __ASM_RISCV_IO_H diff --git a/arch/riscv/include/asm/linkage.h b/arch/riscv/include/asm/linkage.h index 60d5317797..0c8822b7d4 100644 --- a/arch/riscv/include/asm/linkage.h +++ b/arch/riscv/include/asm/linkage.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * U-Boot - linkage.h * * Copyright (c) 2005-2007 Analog Devices Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_LINKAGE_H diff --git a/arch/riscv/include/asm/mach-types.h b/arch/riscv/include/asm/mach-types.h index f70b407998..93afff70b3 100644 --- a/arch/riscv/include/asm/mach-types.h +++ b/arch/riscv/include/asm/mach-types.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick@andestech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_RISCV_MACH_TYPE_H diff --git a/arch/riscv/include/asm/sections.h b/arch/riscv/include/asm/sections.h index 9faa099fb9..9dd36ddda4 100644 --- a/arch/riscv/include/asm/sections.h +++ b/arch/riscv/include/asm/sections.h @@ -1,6 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2012 The Chromium OS Authors. - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_RISCV_SECTIONS_H diff --git a/arch/riscv/include/asm/setup.h b/arch/riscv/include/asm/setup.h index 4b182432f1..ff8de167c6 100644 --- a/arch/riscv/include/asm/setup.h +++ b/arch/riscv/include/asm/setup.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/arch/nds32/include/asm/setup.h * @@ -6,8 +7,6 @@ * Copyright (C) 2013 Ken Kuo (ken_kuo@andestech.com) * Copyright (C) 2017 Rick Chen (rick@andestech.com) * - * SPDX-License-Identifier: GPL-2.0 - * * Structure passed to kernel to tell it about the * hardware it's running on. See Documentation/arm/Setup * for more info. diff --git a/arch/riscv/include/asm/system.h b/arch/riscv/include/asm/system.h index 443a3005d8..a340475823 100644 --- a/arch/riscv/include/asm/system.h +++ b/arch/riscv/include/asm/system.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick@andestech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_RISCV_SYSTEM_H diff --git a/arch/riscv/include/asm/u-boot-riscv.h b/arch/riscv/include/asm/u-boot-riscv.h index 18099cd260..c4c068f9e2 100644 --- a/arch/riscv/include/asm/u-boot-riscv.h +++ b/arch/riscv/include/asm/u-boot-riscv.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> @@ -5,8 +6,6 @@ * * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick@andestech.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _U_BOOT_RISCV_H_ diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h index ddf7a6310f..9e5b32d33e 100644 --- a/arch/riscv/include/asm/u-boot.h +++ b/arch/riscv/include/asm/u-boot.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> @@ -6,8 +7,6 @@ * Copyright (C) 2017 Andes Technology Corporation * Rick Chen, Andes Technology Corporation <rick@andestech.com> * - * SPDX-License-Identifier: GPL-2.0+ - * ******************************************************************** * NOTE: This header file defines an interface to U-Boot. Including * this (unmodified) header file in another file is considered normal |