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/arc | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
| download | u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz | |
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/arc')
44 files changed, 44 insertions, 94 deletions
diff --git a/arch/arc/Makefile b/arch/arc/Makefile index a59231e70e..44568f8cf8 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ libs-y += arch/arc/cpu/$(CPU)/ libs-y += arch/arc/lib/ diff --git a/arch/arc/config.mk b/arch/arc/config.mk index d040454d1a..169e5d7fae 100644 --- a/arch/arc/config.mk +++ b/arch/arc/config.mk @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0+ -# ifndef CONFIG_CPU_BIG_ENDIAN CONFIG_SYS_LITTLE_ENDIAN = 1 diff --git a/arch/arc/cpu/arcv1/Makefile b/arch/arc/cpu/arcv1/Makefile index 6d17ab2886..4d42ac6678 100644 --- a/arch/arc/cpu/arcv1/Makefile +++ b/arch/arc/cpu/arcv1/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += ivt.o diff --git a/arch/arc/cpu/arcv1/ivt.S b/arch/arc/cpu/arcv1/ivt.S index 7df47a2127..3d63430c2b 100644 --- a/arch/arc/cpu/arcv1/ivt.S +++ b/arch/arc/cpu/arcv1/ivt.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ .section .ivt, "ax",@progbits diff --git a/arch/arc/cpu/arcv2/Makefile b/arch/arc/cpu/arcv2/Makefile index e338a0ae56..ab740266b4 100644 --- a/arch/arc/cpu/arcv2/Makefile +++ b/arch/arc/cpu/arcv2/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += ivt.o diff --git a/arch/arc/cpu/arcv2/ivt.S b/arch/arc/cpu/arcv2/ivt.S index 7924375fb1..3f5b4094f2 100644 --- a/arch/arc/cpu/arcv2/ivt.S +++ b/arch/arc/cpu/arcv2/ivt.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ .section .ivt, "a",@progbits diff --git a/arch/arc/cpu/u-boot.lds b/arch/arc/cpu/u-boot.lds index d3d0a53bf2..73c642ed6b 100644 --- a/arch/arc/cpu/u-boot.lds +++ b/arch/arc/cpu/u-boot.lds @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile index 63a6694712..6eccec97da 100644 --- a/arch/arc/dts/Makefile +++ b/arch/arc/dts/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ dtb-$(CONFIG_TARGET_AXS101) += axs101.dtb dtb-$(CONFIG_TARGET_AXS103) += axs103.dtb diff --git a/arch/arc/dts/abilis_tb100.dts b/arch/arc/dts/abilis_tb100.dts index 23329ec016..de3e57d246 100644 --- a/arch/arc/dts/abilis_tb100.dts +++ b/arch/arc/dts/abilis_tb100.dts @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Synopsys, Inc. (www.synopsys.com) - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/arc/dts/axc001.dtsi b/arch/arc/dts/axc001.dtsi index 1cf630d23b..412580a380 100644 --- a/arch/arc/dts/axc001.dtsi +++ b/arch/arc/dts/axc001.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ /include/ "skeleton.dtsi" diff --git a/arch/arc/dts/axc003.dtsi b/arch/arc/dts/axc003.dtsi index 5e9270a0b7..75a9de61de 100644 --- a/arch/arc/dts/axc003.dtsi +++ b/arch/arc/dts/axc003.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ /include/ "skeleton.dtsi" diff --git a/arch/arc/dts/axs101.dts b/arch/arc/dts/axs101.dts index ec7b8b7574..13873be320 100644 --- a/arch/arc/dts/axs101.dts +++ b/arch/arc/dts/axs101.dts @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/arc/dts/axs103.dts b/arch/arc/dts/axs103.dts index 8f7a76f377..81778c8983 100644 --- a/arch/arc/dts/axs103.dts +++ b/arch/arc/dts/axs103.dts @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi index 17ef656483..3855a34dc2 100644 --- a/arch/arc/dts/axs10x_mb.dtsi +++ b/arch/arc/dts/axs10x_mb.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ / { diff --git a/arch/arc/dts/hsdk.dts b/arch/arc/dts/hsdk.dts index 80b864af74..264512877e 100644 --- a/arch/arc/dts/hsdk.dts +++ b/arch/arc/dts/hsdk.dts @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/arc/dts/nsim.dts b/arch/arc/dts/nsim.dts index 491c46da56..9c1c7aa0eb 100644 --- a/arch/arc/dts/nsim.dts +++ b/arch/arc/dts/nsim.dts @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015-2016 Synopsys, Inc. (www.synopsys.com) - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h index 3a513149f5..56ec11f789 100644 --- a/arch/arc/include/asm/arcregs.h +++ b/arch/arc/include/asm/arcregs.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARC_ARCREGS_H diff --git a/arch/arc/include/asm/bitops.h b/arch/arc/include/asm/bitops.h index 370cb46e9f..c6dd28ecef 100644 --- a/arch/arc/include/asm/bitops.h +++ b/arch/arc/include/asm/bitops.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_BITOPS_H diff --git a/arch/arc/include/asm/byteorder.h b/arch/arc/include/asm/byteorder.h index 2fa9776ca5..8c171bb294 100644 --- a/arch/arc/include/asm/byteorder.h +++ b/arch/arc/include/asm/byteorder.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_BYTEORDER_H diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h index 2269183615..1604cd0b3e 100644 --- a/arch/arc/include/asm/cache.h +++ b/arch/arc/include/asm/cache.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_CACHE_H diff --git a/arch/arc/include/asm/config.h b/arch/arc/include/asm/config.h index 7aaa5c2912..d88c361488 100644 --- a/arch/arc/include/asm/config.h +++ b/arch/arc/include/asm/config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_CONFIG_H_ diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h index 43e1343095..8f9c83d3c2 100644 --- a/arch/arc/include/asm/global_data.h +++ b/arch/arc/include/asm/global_data.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_GLOBAL_DATA_H diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h index 060cdf637b..fa844b54f4 100644 --- a/arch/arc/include/asm/io.h +++ b/arch/arc/include/asm/io.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_IO_H diff --git a/arch/arc/include/asm/linkage.h b/arch/arc/include/asm/linkage.h index 2d1a603062..2d42ed4098 100644 --- a/arch/arc/include/asm/linkage.h +++ b/arch/arc/include/asm/linkage.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2004, 2007-2010, 2011-2015 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_LINKAGE_H diff --git a/arch/arc/include/asm/posix_types.h b/arch/arc/include/asm/posix_types.h index 51347a48d4..13838cbc1d 100644 --- a/arch/arc/include/asm/posix_types.h +++ b/arch/arc/include/asm/posix_types.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_POSIX_TYPES_H diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index 635542344a..03e31fb4e9 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARC_PROCESSOR_H diff --git a/arch/arc/include/asm/ptrace.h b/arch/arc/include/asm/ptrace.h index 8f73b31c10..6965e89362 100644 --- a/arch/arc/include/asm/ptrace.h +++ b/arch/arc/include/asm/ptrace.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_PTRACE_H diff --git a/arch/arc/include/asm/sections.h b/arch/arc/include/asm/sections.h index 00f12172ab..1c9c9db138 100644 --- a/arch/arc/include/asm/sections.h +++ b/arch/arc/include/asm/sections.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_SECTIONS_H diff --git a/arch/arc/include/asm/types.h b/arch/arc/include/asm/types.h index 24eeb76bd6..3e37781677 100644 --- a/arch/arc/include/asm/types.h +++ b/arch/arc/include/asm/types.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_TYPES_H diff --git a/arch/arc/include/asm/u-boot-arc.h b/arch/arc/include/asm/u-boot-arc.h index a56ccf1b5d..dd2c0949c6 100644 --- a/arch/arc/include/asm/u-boot-arc.h +++ b/arch/arc/include/asm/u-boot-arc.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_U_BOOT_ARC_H__ diff --git a/arch/arc/include/asm/u-boot.h b/arch/arc/include/asm/u-boot.h index 045487278e..36c220745f 100644 --- a/arch/arc/include/asm/u-boot.h +++ b/arch/arc/include/asm/u-boot.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARC_U_BOOT_H__ diff --git a/arch/arc/lib/Makefile b/arch/arc/lib/Makefile index 6b7fb0fdff..0eb44bcf33 100644 --- a/arch/arc/lib/Makefile +++ b/arch/arc/lib/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0+ -# extra-y = start.o head-y := start.o diff --git a/arch/arc/lib/_millicodethunk.S b/arch/arc/lib/_millicodethunk.S index b3324167d4..4ad16ae3b6 100644 --- a/arch/arc/lib/_millicodethunk.S +++ b/arch/arc/lib/_millicodethunk.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 1995, 1997, 2007-2013 Free Software Foundation, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* ANSI concatenation macros. */ diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 4f04aad34a..254e0284b3 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/cache.h> diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index 8203fae145..6f52877643 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index cb80893337..cb95e06e93 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arc/lib/init_helpers.c b/arch/arc/lib/init_helpers.c index 822318ff43..c853f25d34 100644 --- a/arch/arc/lib/init_helpers.c +++ b/arch/arc/lib/init_helpers.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/cache.h> diff --git a/arch/arc/lib/interrupts.c b/arch/arc/lib/interrupts.c index ee638d506b..24ff751220 100644 --- a/arch/arc/lib/interrupts.c +++ b/arch/arc/lib/interrupts.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arc/lib/ints_low.S b/arch/arc/lib/ints_low.S index e3778847ab..38c45c60a9 100644 --- a/arch/arc/lib/ints_low.S +++ b/arch/arc/lib/ints_low.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <linux/linkage.h> diff --git a/arch/arc/lib/libgcc2.c b/arch/arc/lib/libgcc2.c index d5ad327f65..b92a841a37 100644 --- a/arch/arc/lib/libgcc2.c +++ b/arch/arc/lib/libgcc2.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 1989-2013 Free Software Foundation, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "libgcc2.h" diff --git a/arch/arc/lib/libgcc2.h b/arch/arc/lib/libgcc2.h index 8813c3bf4c..9c3ce99892 100644 --- a/arch/arc/lib/libgcc2.h +++ b/arch/arc/lib/libgcc2.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 1989-2013 Free Software Foundation, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_LIBGCC_H diff --git a/arch/arc/lib/relocate.c b/arch/arc/lib/relocate.c index 96b4bd3d8f..a3b7428d85 100644 --- a/arch/arc/lib/relocate.c +++ b/arch/arc/lib/relocate.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arc/lib/reset.c b/arch/arc/lib/reset.c index 98ebf1d445..40fb0f1fbd 100644 --- a/arch/arc/lib/reset.c +++ b/arch/arc/lib/reset.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <command.h> diff --git a/arch/arc/lib/start.S b/arch/arc/lib/start.S index c78dd001d8..3fb05606c7 100644 --- a/arch/arc/lib/start.S +++ b/arch/arc/lib/start.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> |