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/hisilicon/hikey/Makefile | 4 +--- board/hisilicon/hikey/hikey.c | 3 +-- board/hisilicon/poplar/Makefile | 4 +--- board/hisilicon/poplar/poplar.c | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) (limited to 'board/hisilicon') diff --git a/board/hisilicon/hikey/Makefile b/board/hisilicon/hikey/Makefile index d4ec8c7f43..5b8e76f0b9 100644 --- a/board/hisilicon/hikey/Makefile +++ b/board/hisilicon/hikey/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2004 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := hikey.o diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c index 5357f870a9..940ae82c45 100644 --- a/board/hisilicon/hikey/hikey.c +++ b/board/hisilicon/hikey/hikey.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Linaro * Peter Griffin - * - * SPDX-License-Identifier: GPL-2.0+ */ #include #include diff --git a/board/hisilicon/poplar/Makefile b/board/hisilicon/poplar/Makefile index 101545d212..9f2e9c4d48 100644 --- a/board/hisilicon/poplar/Makefile +++ b/board/hisilicon/poplar/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2017 Linaro # Jorge Ramirez-Ortiz -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := poplar.o diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index d542f6857b..9e8eac7838 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2017 Linaro * Jorge Ramirez-Ortiz - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit