diff options
| author | Tom Rini | 2018-05-06 17:58:06 -0400 |
|---|---|---|
| committer | Tom Rini | 2018-05-07 09:34:12 -0400 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /arch/xtensa/include | |
| 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/xtensa/include')
30 files changed, 30 insertions, 60 deletions
diff --git a/arch/xtensa/include/asm/addrspace.h b/arch/xtensa/include/asm/addrspace.h index 1d62259fd5b..3b27f9308a0 100644 --- a/arch/xtensa/include/asm/addrspace.h +++ b/arch/xtensa/include/asm/addrspace.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2008-2013 Tensilica Inc. * Copyright (C) 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_ADDRSPACE_H diff --git a/arch/xtensa/include/asm/arch-dc232b/core.h b/arch/xtensa/include/asm/arch-dc232b/core.h index 548c971f266..c50a358c522 100644 --- a/arch/xtensa/include/asm/arch-dc232b/core.h +++ b/arch/xtensa/include/asm/arch-dc232b/core.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Xtensa processor core configuration information. * This file is autogenerated, please do not edit. * * Copyright (C) 1999-2007 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CORE_CONFIGURATION_H diff --git a/arch/xtensa/include/asm/arch-dc232b/tie-asm.h b/arch/xtensa/include/asm/arch-dc232b/tie-asm.h index 501d885e68f..05ce1107f5a 100644 --- a/arch/xtensa/include/asm/arch-dc232b/tie-asm.h +++ b/arch/xtensa/include/asm/arch-dc232b/tie-asm.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This header file contains assembly-language definitions (assembly * macros, etc.) for this specific Xtensa processor's TIE extensions @@ -5,8 +6,6 @@ * This file is autogenerated, please do not edit. * * Copyright (C) 1999-2007 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CORE_TIE_ASM_H diff --git a/arch/xtensa/include/asm/arch-dc232b/tie.h b/arch/xtensa/include/asm/arch-dc232b/tie.h index 8479a0137d5..2e70311d3e4 100644 --- a/arch/xtensa/include/asm/arch-dc232b/tie.h +++ b/arch/xtensa/include/asm/arch-dc232b/tie.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This header file describes this specific Xtensa processor's TIE extensions * that extend basic Xtensa core functionality. It is customized to this @@ -5,8 +6,6 @@ * This file is autogenerated, please do not edit. * * Copyright (C) 1999-2007 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CORE_TIE_H diff --git a/arch/xtensa/include/asm/arch-dc233c/core.h b/arch/xtensa/include/asm/arch-dc233c/core.h index fd2c0e8d0b5..8a7345559c2 100644 --- a/arch/xtensa/include/asm/arch-dc233c/core.h +++ b/arch/xtensa/include/asm/arch-dc233c/core.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Xtensa processor core configuration information. * This file is autogenerated, please do not edit. * * Copyright (C) 1999-2010 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CORE_CONFIGURATION_H diff --git a/arch/xtensa/include/asm/arch-dc233c/tie-asm.h b/arch/xtensa/include/asm/arch-dc233c/tie-asm.h index 38217ec69e3..53a1e42a745 100644 --- a/arch/xtensa/include/asm/arch-dc233c/tie-asm.h +++ b/arch/xtensa/include/asm/arch-dc233c/tie-asm.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This header file contains assembly-language definitions (assembly * macros, etc.) for this specific Xtensa processor's TIE extensions @@ -5,8 +6,6 @@ * This file is autogenerated, please do not edit. * * Copyright (C) 1999-2010 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CORE_TIE_ASM_H diff --git a/arch/xtensa/include/asm/arch-dc233c/tie.h b/arch/xtensa/include/asm/arch-dc233c/tie.h index 32a714f77dc..ddee4ad3f6e 100644 --- a/arch/xtensa/include/asm/arch-dc233c/tie.h +++ b/arch/xtensa/include/asm/arch-dc233c/tie.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This header file describes this specific Xtensa processor's TIE extensions * that extend basic Xtensa core functionality. It is customized to this @@ -5,8 +6,6 @@ * This file is autogenerated, please do not edit. * * Copyright (C) 1999-2010 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CORE_TIE_H diff --git a/arch/xtensa/include/asm/arch-de212/core.h b/arch/xtensa/include/asm/arch-de212/core.h index be135016843..7e94339e6d9 100644 --- a/arch/xtensa/include/asm/arch-de212/core.h +++ b/arch/xtensa/include/asm/arch-de212/core.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Xtensa processor core configuration information. * This file is autogenerated, please do not edit. * * Copyright (C) 1999-2015 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CORE_CONFIGURATION_H diff --git a/arch/xtensa/include/asm/arch-de212/tie-asm.h b/arch/xtensa/include/asm/arch-de212/tie-asm.h index 7213550b8a8..988aa2ba578 100644 --- a/arch/xtensa/include/asm/arch-de212/tie-asm.h +++ b/arch/xtensa/include/asm/arch-de212/tie-asm.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This header file contains assembly-language definitions (assembly * macros, etc.) for this specific Xtensa processor's TIE extensions @@ -5,8 +6,6 @@ * This file is autogenerated, please do not edit. * * Copyright (C) 1999-2015 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CORE_TIE_ASM_H diff --git a/arch/xtensa/include/asm/arch-de212/tie.h b/arch/xtensa/include/asm/arch-de212/tie.h index fd0fbfe6e7d..2f36493d885 100644 --- a/arch/xtensa/include/asm/arch-de212/tie.h +++ b/arch/xtensa/include/asm/arch-de212/tie.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This header file describes this specific Xtensa processor's TIE extensions * that extend basic Xtensa core functionality. It is customized to this @@ -5,8 +6,6 @@ * This file is autogenerated, please do not edit. * * Copyright (C) 1999-2015 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CORE_TIE_H diff --git a/arch/xtensa/include/asm/asmmacro.h b/arch/xtensa/include/asm/asmmacro.h index b7adc7e1980..78613fc5797 100644 --- a/arch/xtensa/include/asm/asmmacro.h +++ b/arch/xtensa/include/asm/asmmacro.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2005 - 2013 Tensilica Inc. * Copyright (C) 2014 - 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_ASMMACRO_H diff --git a/arch/xtensa/include/asm/atomic.h b/arch/xtensa/include/asm/atomic.h index a75baa09e0a..42b32f5d3d6 100644 --- a/arch/xtensa/include/asm/atomic.h +++ b/arch/xtensa/include/asm/atomic.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_ATOMIC_H diff --git a/arch/xtensa/include/asm/bitops.h b/arch/xtensa/include/asm/bitops.h index 550d12f4986..48a3e1f517e 100644 --- a/arch/xtensa/include/asm/bitops.h +++ b/arch/xtensa/include/asm/bitops.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2001 - 2012 Tensilica Inc. * Copyright (C) 2014 - 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_BITOPS_H diff --git a/arch/xtensa/include/asm/bootparam.h b/arch/xtensa/include/asm/bootparam.h index a2a9013ebf1..d7562564af7 100644 --- a/arch/xtensa/include/asm/bootparam.h +++ b/arch/xtensa/include/asm/bootparam.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Definition of the Linux/Xtensa boot parameter structure * * Copyright (C) 2001 - 2009 Tensilica Inc. * * (Concept borrowed from the 68K port) - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_BOOTPARAM_H diff --git a/arch/xtensa/include/asm/byteorder.h b/arch/xtensa/include/asm/byteorder.h index 278653ce481..2137dcff24b 100644 --- a/arch/xtensa/include/asm/byteorder.h +++ b/arch/xtensa/include/asm/byteorder.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Based on Linux/Xtensa kernel version * * Copyright (C) 2001 - 2007 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_BYTEORDER_H diff --git a/arch/xtensa/include/asm/cache.h b/arch/xtensa/include/asm/cache.h index 08c534ca014..68b8330ccb0 100644 --- a/arch/xtensa/include/asm/cache.h +++ b/arch/xtensa/include/asm/cache.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2009 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CACHE_H #define _XTENSA_CACHE_H diff --git a/arch/xtensa/include/asm/cacheasm.h b/arch/xtensa/include/asm/cacheasm.h index 342a8177e41..6d321f88660 100644 --- a/arch/xtensa/include/asm/cacheasm.h +++ b/arch/xtensa/include/asm/cacheasm.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2006 Tensilica Inc. * Copyright (C) 2014 - 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_CACHEASM_H diff --git a/arch/xtensa/include/asm/config.h b/arch/xtensa/include/asm/config.h index db1ea87c30b..5a95fc93f7b 100644 --- a/arch/xtensa/include/asm/config.h +++ b/arch/xtensa/include/asm/config.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2009 Tensilica Inc. * Copyright (C) 2014 - 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CONFIG_H_ diff --git a/arch/xtensa/include/asm/global_data.h b/arch/xtensa/include/asm/global_data.h index 45693457ad3..1157978ab68 100644 --- a/arch/xtensa/include/asm/global_data.h +++ b/arch/xtensa/include/asm/global_data.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2007, Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_GBL_DATA_H diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h index c9e335f4f66..76a646e8825 100644 --- a/arch/xtensa/include/asm/io.h +++ b/arch/xtensa/include/asm/io.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * IO header file * * Copyright (C) 2001-2007 Tensilica Inc. * Based on the Linux/Xtensa version of this header. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_IO_H diff --git a/arch/xtensa/include/asm/ldscript.h b/arch/xtensa/include/asm/ldscript.h index 62a1c052685..08f5d0135ed 100644 --- a/arch/xtensa/include/asm/ldscript.h +++ b/arch/xtensa/include/asm/ldscript.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2007 Tensilica, Inc. * (C) Copyright 2014 - 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_LDSCRIPT_H diff --git a/arch/xtensa/include/asm/misc.h b/arch/xtensa/include/asm/misc.h index 5a2708fbeff..3ed9fcb3a2e 100644 --- a/arch/xtensa/include/asm/misc.h +++ b/arch/xtensa/include/asm/misc.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2008, Tensilica Inc. * - * 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 diff --git a/arch/xtensa/include/asm/posix_types.h b/arch/xtensa/include/asm/posix_types.h index 821115c0066..7fb65ead671 100644 --- a/arch/xtensa/include/asm/posix_types.h +++ b/arch/xtensa/include/asm/posix_types.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2007, Tensilica Inc. * * Based on the ARM version: Copyright (C) 1996-1998 Russell King. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_POSIX_TYPES_H #define _XTENSA_POSIX_TYPES_H diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h index 8822f80f8dc..22203c96497 100644 --- a/arch/xtensa/include/asm/processor.h +++ b/arch/xtensa/include/asm/processor.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 1997 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_PROCESSOR_H diff --git a/arch/xtensa/include/asm/ptrace.h b/arch/xtensa/include/asm/ptrace.h index d187dbf4c98..7717016cc67 100644 --- a/arch/xtensa/include/asm/ptrace.h +++ b/arch/xtensa/include/asm/ptrace.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2001 - 2007 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_PTRACE_H diff --git a/arch/xtensa/include/asm/regs.h b/arch/xtensa/include/asm/regs.h index 0a82a221dda..32b50f95114 100644 --- a/arch/xtensa/include/asm/regs.h +++ b/arch/xtensa/include/asm/regs.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2006 Tensilica, Inc. All Rights Reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_REGS_H diff --git a/arch/xtensa/include/asm/sections.h b/arch/xtensa/include/asm/sections.h index 2309b146388..af2c177bea8 100644 --- a/arch/xtensa/include/asm/sections.h +++ b/arch/xtensa/include/asm/sections.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (c) 2012 The Chromium OS Authors. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_XTENSA_SECTIONS_H diff --git a/arch/xtensa/include/asm/system.h b/arch/xtensa/include/asm/system.h index 5b710089c11..a241568f603 100644 --- a/arch/xtensa/include/asm/system.h +++ b/arch/xtensa/include/asm/system.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_SYSTEM_H diff --git a/arch/xtensa/include/asm/types.h b/arch/xtensa/include/asm/types.h index f7eda9dc590..bae1a480ee8 100644 --- a/arch/xtensa/include/asm/types.h +++ b/arch/xtensa/include/asm/types.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 1997 Tensilica Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _XTENSA_TYPES_H diff --git a/arch/xtensa/include/asm/u-boot.h b/arch/xtensa/include/asm/u-boot.h index cfdc0367b33..a3dba8db799 100644 --- a/arch/xtensa/include/asm/u-boot.h +++ b/arch/xtensa/include/asm/u-boot.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2007, Tensilica Inc. * - * 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 |