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 --- board/altera/arria10-socdk/Makefile | 4 +--- board/altera/arria10-socdk/socfpga.c | 3 +-- board/altera/arria5-socdk/Makefile | 4 +--- board/altera/arria5-socdk/qts/iocsr_config.h | 3 +-- board/altera/arria5-socdk/qts/pinmux_config.h | 3 +-- board/altera/arria5-socdk/qts/pll_config.h | 3 +-- board/altera/arria5-socdk/qts/sdram_config.h | 3 +-- board/altera/arria5-socdk/socfpga.c | 3 +-- board/altera/cyclone5-socdk/Makefile | 4 +--- board/altera/cyclone5-socdk/qts/iocsr_config.h | 3 +-- board/altera/cyclone5-socdk/qts/pinmux_config.h | 3 +-- board/altera/cyclone5-socdk/qts/pll_config.h | 3 +-- board/altera/cyclone5-socdk/qts/sdram_config.h | 3 +-- board/altera/cyclone5-socdk/socfpga.c | 3 +-- 14 files changed, 14 insertions(+), 31 deletions(-) (limited to 'board/altera') diff --git a/board/altera/arria10-socdk/Makefile b/board/altera/arria10-socdk/Makefile index 1d885cec1fb..80d00043464 100644 --- a/board/altera/arria10-socdk/Makefile +++ b/board/altera/arria10-socdk/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 # # Copyright (C) 2015 Altera Corporation -# -# SPDX-License-Identifier: GPL-2.0 -# obj-y := socfpga.o diff --git a/board/altera/arria10-socdk/socfpga.c b/board/altera/arria10-socdk/socfpga.c index 85166336f9d..4c466cb9444 100644 --- a/board/altera/arria10-socdk/socfpga.c +++ b/board/altera/arria10-socdk/socfpga.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2015 Altera Corporation - * - * SPDX-License-Identifier: GPL-2.0 */ #include diff --git a/board/altera/arria5-socdk/Makefile b/board/altera/arria5-socdk/Makefile index 86f9b78cad7..e1c8a6b3c7c 100644 --- a/board/altera/arria5-socdk/Makefile +++ b/board/altera/arria5-socdk/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2001-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # (C) Copyright 2010, Thomas Chou -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := socfpga.o diff --git a/board/altera/arria5-socdk/qts/iocsr_config.h b/board/altera/arria5-socdk/qts/iocsr_config.h index e2bb4bb92e0..69a92de6361 100644 --- a/board/altera/arria5-socdk/qts/iocsr_config.h +++ b/board/altera/arria5-socdk/qts/iocsr_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA IOCSR configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_IOCSR_CONFIG_H__ diff --git a/board/altera/arria5-socdk/qts/pinmux_config.h b/board/altera/arria5-socdk/qts/pinmux_config.h index 069d492d521..78a03258249 100644 --- a/board/altera/arria5-socdk/qts/pinmux_config.h +++ b/board/altera/arria5-socdk/qts/pinmux_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA PinMux configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_PINMUX_CONFIG_H__ diff --git a/board/altera/arria5-socdk/qts/pll_config.h b/board/altera/arria5-socdk/qts/pll_config.h index f6c5c959e58..6c832543444 100644 --- a/board/altera/arria5-socdk/qts/pll_config.h +++ b/board/altera/arria5-socdk/qts/pll_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA Clock and PLL configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_PLL_CONFIG_H__ diff --git a/board/altera/arria5-socdk/qts/sdram_config.h b/board/altera/arria5-socdk/qts/sdram_config.h index 2589f3f97ec..927a7a4f8e0 100644 --- a/board/altera/arria5-socdk/qts/sdram_config.h +++ b/board/altera/arria5-socdk/qts/sdram_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA SDRAM configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_SDRAM_CONFIG_H__ diff --git a/board/altera/arria5-socdk/socfpga.c b/board/altera/arria5-socdk/socfpga.c index 97fb902f8e6..48bfe329517 100644 --- a/board/altera/arria5-socdk/socfpga.c +++ b/board/altera/arria5-socdk/socfpga.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Altera Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/altera/cyclone5-socdk/Makefile b/board/altera/cyclone5-socdk/Makefile index 86f9b78cad7..e1c8a6b3c7c 100644 --- a/board/altera/cyclone5-socdk/Makefile +++ b/board/altera/cyclone5-socdk/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2001-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # (C) Copyright 2010, Thomas Chou -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := socfpga.o diff --git a/board/altera/cyclone5-socdk/qts/iocsr_config.h b/board/altera/cyclone5-socdk/qts/iocsr_config.h index 49a4feef31c..81c507b842b 100644 --- a/board/altera/cyclone5-socdk/qts/iocsr_config.h +++ b/board/altera/cyclone5-socdk/qts/iocsr_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA IOCSR configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_IOCSR_CONFIG_H__ diff --git a/board/altera/cyclone5-socdk/qts/pinmux_config.h b/board/altera/cyclone5-socdk/qts/pinmux_config.h index 2d123bac225..ec64ae17a16 100644 --- a/board/altera/cyclone5-socdk/qts/pinmux_config.h +++ b/board/altera/cyclone5-socdk/qts/pinmux_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA PinMux configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_PINMUX_CONFIG_H__ diff --git a/board/altera/cyclone5-socdk/qts/pll_config.h b/board/altera/cyclone5-socdk/qts/pll_config.h index 408235eb935..ae5cfab0cf7 100644 --- a/board/altera/cyclone5-socdk/qts/pll_config.h +++ b/board/altera/cyclone5-socdk/qts/pll_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA Clock and PLL configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_PLL_CONFIG_H__ diff --git a/board/altera/cyclone5-socdk/qts/sdram_config.h b/board/altera/cyclone5-socdk/qts/sdram_config.h index 8f3ddceed23..8adbfec11f9 100644 --- a/board/altera/cyclone5-socdk/qts/sdram_config.h +++ b/board/altera/cyclone5-socdk/qts/sdram_config.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA SDRAM configuration - * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_SDRAM_CONFIG_H__ diff --git a/board/altera/cyclone5-socdk/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c index 97fb902f8e6..48bfe329517 100644 --- a/board/altera/cyclone5-socdk/socfpga.c +++ b/board/altera/cyclone5-socdk/socfpga.c @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Altera Corporation - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3