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/cssi/MCR3000/MCR3000.c | 3 +-- board/cssi/MCR3000/Makefile | 4 +--- board/cssi/MCR3000/nand.c | 3 +-- board/cssi/MCR3000/u-boot.lds | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) (limited to 'board/cssi') diff --git a/board/cssi/MCR3000/MCR3000.c b/board/cssi/MCR3000/MCR3000.c index 6939a2cf61..ffbeb14ed0 100644 --- a/board/cssi/MCR3000/MCR3000.c +++ b/board/cssi/MCR3000/MCR3000.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010-2017 CS Systemes d'Information * Florent Trinh Thai * Christophe Leroy * * Board specific routines for the MCR3000 board - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/cssi/MCR3000/Makefile b/board/cssi/MCR3000/Makefile index 401d5aa4c1..68d6812a89 100644 --- a/board/cssi/MCR3000/Makefile +++ b/board/cssi/MCR3000/Makefile @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2010-2017 CS Systemes d'Information # Christophe Leroy # -# SPDX-License-Identifier: GPL-2.0+ -# -# obj-y += MCR3000.o obj-$(CONFIG_CMD_NAND) += nand.o diff --git a/board/cssi/MCR3000/nand.c b/board/cssi/MCR3000/nand.c index 4c6fc865f2..15a10bffad 100644 --- a/board/cssi/MCR3000/nand.c +++ b/board/cssi/MCR3000/nand.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010-2017 CS Systemes d'Information * Florent Trinh Thai * Christophe Leroy - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/cssi/MCR3000/u-boot.lds b/board/cssi/MCR3000/u-boot.lds index 990cca4ebb..a32c0e721e 100644 --- a/board/cssi/MCR3000/u-boot.lds +++ b/board/cssi/MCR3000/u-boot.lds @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2010-2017 CS Systemes d'Information * Christophe Leroy @@ -6,8 +7,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * Modified by Yuli Barcohen - * - * SPDX-License-Identifier: GPL-2.0+ */ OUTPUT_ARCH(powerpc) -- cgit v1.2.3