From 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 6 May 2018 17:58:06 -0400 Subject: 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 --- arch/nds32/Makefile | 4 +--- arch/nds32/config.mk | 2 +- arch/nds32/cpu/n1213/Makefile | 4 +--- arch/nds32/cpu/n1213/ae3xx/Makefile | 4 +--- arch/nds32/cpu/n1213/ae3xx/cpu.c | 3 +-- arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S | 3 +-- arch/nds32/cpu/n1213/ae3xx/timer.c | 3 +-- arch/nds32/cpu/n1213/ae3xx/watchdog.S | 3 +-- arch/nds32/cpu/n1213/ag101/Makefile | 4 +--- arch/nds32/cpu/n1213/ag101/cpu.c | 3 +-- arch/nds32/cpu/n1213/ag101/lowlevel_init.S | 3 +-- arch/nds32/cpu/n1213/ag101/timer.c | 3 +-- arch/nds32/cpu/n1213/ag101/watchdog.S | 3 +-- arch/nds32/cpu/n1213/start.S | 3 +-- arch/nds32/cpu/n1213/u-boot.lds | 3 +-- arch/nds32/dts/Makefile | 4 +--- arch/nds32/include/asm/arch-ae3xx/ae3xx.h | 3 +-- arch/nds32/include/asm/arch-ag101/ag101.h | 3 +-- arch/nds32/include/asm/arch-ag102/ag102.h | 3 +-- arch/nds32/include/asm/bootm.h | 5 +---- arch/nds32/include/asm/cache.h | 3 +-- arch/nds32/include/asm/config.h | 3 +-- arch/nds32/include/asm/dma-mapping.h | 3 +-- arch/nds32/include/asm/global_data.h | 3 +-- arch/nds32/include/asm/io.h | 3 +-- arch/nds32/include/asm/linkage.h | 3 +-- arch/nds32/include/asm/macro.h | 3 +-- arch/nds32/include/asm/sections.h | 2 +- arch/nds32/include/asm/setup.h | 3 +-- arch/nds32/include/asm/system.h | 3 +-- arch/nds32/include/asm/u-boot-nds32.h | 3 +-- arch/nds32/include/asm/u-boot.h | 3 +-- arch/nds32/lib/Makefile | 4 +--- arch/nds32/lib/boot.c | 3 +-- arch/nds32/lib/bootm.c | 3 +-- arch/nds32/lib/cache.c | 3 +-- arch/nds32/lib/interrupts.c | 3 +-- 37 files changed, 37 insertions(+), 80 deletions(-) (limited to 'arch/nds32') diff --git a/arch/nds32/Makefile b/arch/nds32/Makefile index e1eccba173..e9980e85fd 100644 --- a/arch/nds32/Makefile +++ b/arch/nds32/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ head-y := arch/nds32/cpu/$(CPU)/start.o diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk index ca76641773..cb3d8b35b5 100644 --- a/arch/nds32/config.mk +++ b/arch/nds32/config.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2002 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -6,7 +7,6 @@ # Shawn Lin, Andes Technology Corporation # Macpaul Lin, Andes Technology Corporation # -# SPDX-License-Identifier: GPL-2.0+ ifeq ($(CROSS_COMPILE),) CROSS_COMPILE := nds32le-linux- diff --git a/arch/nds32/cpu/n1213/Makefile b/arch/nds32/cpu/n1213/Makefile index 3a9ada10d6..0b8ce7b180 100644 --- a/arch/nds32/cpu/n1213/Makefile +++ b/arch/nds32/cpu/n1213/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,9 +6,6 @@ # Copyright (C) 2011 Andes Technology Corporation # Shawn Lin, Andes Technology Corporation # Macpaul Lin, Andes Technology Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# extra-y = start.o diff --git a/arch/nds32/cpu/n1213/ae3xx/Makefile b/arch/nds32/cpu/n1213/ae3xx/Makefile index 07fa9429a9..721a9ffafa 100644 --- a/arch/nds32/cpu/n1213/ae3xx/Makefile +++ b/arch/nds32/cpu/n1213/ae3xx/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2009 # Marvell Semiconductor @@ -6,9 +7,6 @@ # Copyright (C) 2011 Andes Technology Corporation # Shawn Lin, Andes Technology Corporation # Macpaul Lin, Andes Technology Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := cpu.o timer.o obj-y += lowlevel_init.o diff --git a/arch/nds32/cpu/n1213/ae3xx/cpu.c b/arch/nds32/cpu/n1213/ae3xx/cpu.c index 26f878fb5c..c5a7a3fd0a 100644 --- a/arch/nds32/cpu/n1213/ae3xx/cpu.c +++ b/arch/nds32/cpu/n1213/ae3xx/cpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH @@ -9,8 +10,6 @@ * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ /* CPU specific code */ diff --git a/arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S b/arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S index d4bc2bcd43..507d79e77b 100644 --- a/arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S +++ b/arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ .pic diff --git a/arch/nds32/cpu/n1213/ae3xx/timer.c b/arch/nds32/cpu/n1213/ae3xx/timer.c index a284bf5b1e..23cc7675fd 100644 --- a/arch/nds32/cpu/n1213/ae3xx/timer.c +++ b/arch/nds32/cpu/n1213/ae3xx/timer.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 Faraday Technology * Po-Yu Chuang @@ -5,8 +6,6 @@ * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef CONFIG_TIMER #include diff --git a/arch/nds32/cpu/n1213/ae3xx/watchdog.S b/arch/nds32/cpu/n1213/ae3xx/watchdog.S index 956c5f8449..e46bcfbbeb 100644 --- a/arch/nds32/cpu/n1213/ae3xx/watchdog.S +++ b/arch/nds32/cpu/n1213/ae3xx/watchdog.S @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/nds32/cpu/n1213/ag101/Makefile b/arch/nds32/cpu/n1213/ag101/Makefile index 07fa9429a9..721a9ffafa 100644 --- a/arch/nds32/cpu/n1213/ag101/Makefile +++ b/arch/nds32/cpu/n1213/ag101/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2009 # Marvell Semiconductor @@ -6,9 +7,6 @@ # Copyright (C) 2011 Andes Technology Corporation # Shawn Lin, Andes Technology Corporation # Macpaul Lin, Andes Technology Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := cpu.o timer.o obj-y += lowlevel_init.o diff --git a/arch/nds32/cpu/n1213/ag101/cpu.c b/arch/nds32/cpu/n1213/ag101/cpu.c index 9da0b31b4b..c9cb4333ba 100644 --- a/arch/nds32/cpu/n1213/ag101/cpu.c +++ b/arch/nds32/cpu/n1213/ag101/cpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH @@ -9,8 +10,6 @@ * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ /* CPU specific code */ diff --git a/arch/nds32/cpu/n1213/ag101/lowlevel_init.S b/arch/nds32/cpu/n1213/ag101/lowlevel_init.S index 452d814042..73f1f52056 100644 --- a/arch/nds32/cpu/n1213/ag101/lowlevel_init.S +++ b/arch/nds32/cpu/n1213/ag101/lowlevel_init.S @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ .pic diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c index 0c03a1029c..dfec5b3e96 100644 --- a/arch/nds32/cpu/n1213/ag101/timer.c +++ b/arch/nds32/cpu/n1213/ag101/timer.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 Faraday Technology * Po-Yu Chuang @@ -5,8 +6,6 @@ * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef CONFIG_TIMER #include diff --git a/arch/nds32/cpu/n1213/ag101/watchdog.S b/arch/nds32/cpu/n1213/ag101/watchdog.S index 8442241d71..243096a663 100644 --- a/arch/nds32/cpu/n1213/ag101/watchdog.S +++ b/arch/nds32/cpu/n1213/ag101/watchdog.S @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/nds32/cpu/n1213/start.S b/arch/nds32/cpu/n1213/start.S index 0d98d03fc3..aa9457f5e4 100644 --- a/arch/nds32/cpu/n1213/start.S +++ b/arch/nds32/cpu/n1213/start.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Andesboot - Startup Code for Whitiger core * @@ -5,8 +6,6 @@ * Copyright (C) 2006 Shawn Lin * Copyright (C) 2011 Macpaul Lin * Greentime Hu - * - * SPDX-License-Identifier: GPL-2.0+ */ .pic diff --git a/arch/nds32/cpu/n1213/u-boot.lds b/arch/nds32/cpu/n1213/u-boot.lds index 40db0e6e81..4abaf0af1a 100644 --- a/arch/nds32/cpu/n1213/u-boot.lds +++ b/arch/nds32/cpu/n1213/u-boot.lds @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,8 +6,6 @@ * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ OUTPUT_FORMAT("elf32-nds32", "elf32-nds32", "elf32-nds32") diff --git a/arch/nds32/dts/Makefile b/arch/nds32/dts/Makefile index 1d6b19579c..a8e23ad9ad 100644 --- a/arch/nds32/dts/Makefile +++ b/arch/nds32/dts/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ dtb-$(CONFIG_TARGET_ADP_AG101P) += ag101p.dtb dtb-$(CONFIG_TARGET_ADP_AE3XX) += ae3xx.dtb diff --git a/arch/nds32/include/asm/arch-ae3xx/ae3xx.h b/arch/nds32/include/asm/arch-ae3xx/ae3xx.h index 9d55c9784c..c283cfae9b 100644 --- a/arch/nds32/include/asm/arch-ae3xx/ae3xx.h +++ b/arch/nds32/include/asm/arch-ae3xx/ae3xx.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016 Andes Technology Corporation * Nobuhiro Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __AE3XX_H diff --git a/arch/nds32/include/asm/arch-ag101/ag101.h b/arch/nds32/include/asm/arch-ag101/ag101.h index 0f4c3efbd4..23908f82a4 100644 --- a/arch/nds32/include/asm/arch-ag101/ag101.h +++ b/arch/nds32/include/asm/arch-ag101/ag101.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Andes Technology Corporation * Nobuhiro Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __AG101_H diff --git a/arch/nds32/include/asm/arch-ag102/ag102.h b/arch/nds32/include/asm/arch-ag102/ag102.h index a8aef9381f..d1f4b02e10 100644 --- a/arch/nds32/include/asm/arch-ag102/ag102.h +++ b/arch/nds32/include/asm/arch-ag102/ag102.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __AG102_H diff --git a/arch/nds32/include/asm/bootm.h b/arch/nds32/include/asm/bootm.h index 2e2fe01f0e..804f8581b6 100644 --- a/arch/nds32/include/asm/bootm.h +++ b/arch/nds32/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 - * - * SPDX-License-Identifier: GPL-2.0+ - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef NDS32_BOOTM_H #define NDS32_BOOTM_H diff --git a/arch/nds32/include/asm/cache.h b/arch/nds32/include/asm/cache.h index 7e9aac80ff..6c72b2baf5 100644 --- a/arch/nds32/include/asm/cache.h +++ b/arch/nds32/include/asm/cache.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CACHE_H diff --git a/arch/nds32/include/asm/config.h b/arch/nds32/include/asm/config.h index 7289217164..8964a58f27 100644 --- a/arch/nds32/include/asm/config.h +++ b/arch/nds32/include/asm/config.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Andes Technology Corporation * Copyright (C) 2010 Shawn Lin (nobuhiro@andestech.com) * Copyright (C) 2011 Macpaul Lin (macpaul@andestech.com) - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_CONFIG_H_ diff --git a/arch/nds32/include/asm/dma-mapping.h b/arch/nds32/include/asm/dma-mapping.h index a627306ed8..e6808dc840 100644 --- a/arch/nds32/include/asm/dma-mapping.h +++ b/arch/nds32/include/asm/dma-mapping.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2013 Andes Technology Corporation * Ken Kuo, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_NDS_DMA_MAPPING_H #define __ASM_NDS_DMA_MAPPING_H diff --git a/arch/nds32/include/asm/global_data.h b/arch/nds32/include/asm/global_data.h index 1f5ec1ff1f..be04a18857 100644 --- a/arch/nds32/include/asm/global_data.h +++ b/arch/nds32/include/asm/global_data.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,8 +6,6 @@ * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************** diff --git a/arch/nds32/include/asm/io.h b/arch/nds32/include/asm/io.h index c6d8d9b471..fdfc574afc 100644 --- a/arch/nds32/include/asm/io.h +++ b/arch/nds32/include/asm/io.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/include/asm-nds/io.h * @@ -7,8 +8,6 @@ * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation * - * SPDX-License-Identifier: GPL-2.0 - * * Modifications: * 16-Sep-1996 RMK Inlined the inx/outx functions & optimised for both * constant addresses and variable addresses. diff --git a/arch/nds32/include/asm/linkage.h b/arch/nds32/include/asm/linkage.h index 60d5317797..0c8822b7d4 100644 --- a/arch/nds32/include/asm/linkage.h +++ b/arch/nds32/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/nds32/include/asm/macro.h b/arch/nds32/include/asm/macro.h index 66be258052..4e119470ee 100644 --- a/arch/nds32/include/asm/macro.h +++ b/arch/nds32/include/asm/macro.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * include/asm-nds32/macro.h * * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD * Copyright (C) 2011 Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_NDS_MACRO_H diff --git a/arch/nds32/include/asm/sections.h b/arch/nds32/include/asm/sections.h index c5f3caab80..aba9d97419 100644 --- a/arch/nds32/include/asm/sections.h +++ b/arch/nds32/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_NDS32_SECTIONS_H diff --git a/arch/nds32/include/asm/setup.h b/arch/nds32/include/asm/setup.h index 833d979af5..8217bbf6fe 100644 --- a/arch/nds32/include/asm/setup.h +++ b/arch/nds32/include/asm/setup.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/arch/nds32/include/asm/setup.h * @@ -5,8 +6,6 @@ * Copyright (C) 2008 Andes Technology Corporation * Copyright (C) 2013 Ken Kuo (ken_kuo@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/nds32/include/asm/system.h b/arch/nds32/include/asm/system.h index 007e66bd68..5453a9b902 100644 --- a/arch/nds32/include/asm/system.h +++ b/arch/nds32/include/asm/system.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2011 Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_NDS_SYSTEM_H diff --git a/arch/nds32/include/asm/u-boot-nds32.h b/arch/nds32/include/asm/u-boot-nds32.h index dee5f43ae1..7d39320c15 100644 --- a/arch/nds32/include/asm/u-boot-nds32.h +++ b/arch/nds32/include/asm/u-boot-nds32.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH @@ -6,8 +7,6 @@ * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _U_BOOT_NDS32_H_ diff --git a/arch/nds32/include/asm/u-boot.h b/arch/nds32/include/asm/u-boot.h index 4378ebf44b..68701d6da9 100644 --- a/arch/nds32/include/asm/u-boot.h +++ b/arch/nds32/include/asm/u-boot.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH @@ -7,8 +8,6 @@ * Copyright (C) 2010 Shawn Lin (nobuhiro@andestech.com) * Copyright (C) 2011 Macpaul Lin (macpaul@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 diff --git a/arch/nds32/lib/Makefile b/arch/nds32/lib/Makefile index c88ad726bc..501f26f1c3 100644 --- a/arch/nds32/lib/Makefile +++ b/arch/nds32/lib/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -5,9 +6,6 @@ # Copyright (C) 2011 Andes Technology Corporation # Shawn Lin, Andes Technology Corporation # Macpaul Lin, Andes Technology Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += cache.o obj-$(CONFIG_CMD_BOOTM) += bootm.o diff --git a/arch/nds32/lib/boot.c b/arch/nds32/lib/boot.c index 1313506ed5..c50e8e5168 100644 --- a/arch/nds32/lib/boot.c +++ b/arch/nds32/lib/boot.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 Andes Technology Corporation * Rick Chen, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c index 0d7f578517..0cfdc52b46 100644 --- a/arch/nds32/lib/bootm.c +++ b/arch/nds32/lib/bootm.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/nds32/lib/cache.c b/arch/nds32/lib/cache.c index 846948167f..9ab30d1965 100644 --- a/arch/nds32/lib/cache.c +++ b/arch/nds32/lib/cache.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/arch/nds32/lib/interrupts.c b/arch/nds32/lib/interrupts.c index 72ff78d1d7..966c19a1ae 100644 --- a/arch/nds32/lib/interrupts.c +++ b/arch/nds32/lib/interrupts.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH @@ -6,8 +7,6 @@ * Copyright (C) 2011 Andes Technology Corporation * Shawn Lin, Andes Technology Corporation * Macpaul Lin, Andes Technology Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3