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/creative/xfi3/Makefile | 4 +--- board/creative/xfi3/spl_boot.c | 3 +-- board/creative/xfi3/xfi3.c | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'board/creative') diff --git a/board/creative/xfi3/Makefile b/board/creative/xfi3/Makefile index e8eb9ab26e..67d68dd621 100644 --- a/board/creative/xfi3/Makefile +++ b/board/creative/xfi3/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# ifndef CONFIG_SPL_BUILD obj-y := xfi3.o diff --git a/board/creative/xfi3/spl_boot.c b/board/creative/xfi3/spl_boot.c index af7aa0ebdd..67c1e9801b 100644 --- a/board/creative/xfi3/spl_boot.c +++ b/board/creative/xfi3/spl_boot.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Creative ZEN X-Fi3 setup * * Copyright (C) 2013 Marek Vasut - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c index 509c671cda..228a3943c0 100644 --- a/board/creative/xfi3/xfi3.c +++ b/board/creative/xfi3/xfi3.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Creative ZEN X-Fi3 board * @@ -6,8 +7,6 @@ * Hardware investigation done by: * * Amaury Pouly - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3