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/broadcom/bcm23550_w1d/Makefile | 4 +--- board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 3 +-- board/broadcom/bcm28155_ap/Makefile | 4 +--- board/broadcom/bcm28155_ap/bcm28155_ap.c | 3 +-- board/broadcom/bcm_ep/Makefile | 4 +--- board/broadcom/bcm_ep/board.c | 3 +-- board/broadcom/bcmns2/Makefile | 4 +--- board/broadcom/bcmns2/northstar2.c | 3 +-- 8 files changed, 8 insertions(+), 20 deletions(-) (limited to 'board/broadcom') diff --git a/board/broadcom/bcm23550_w1d/Makefile b/board/broadcom/bcm23550_w1d/Makefile index 76bd032..0552f37 100644 --- a/board/broadcom/bcm23550_w1d/Makefile +++ b/board/broadcom/bcm23550_w1d/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2013 Broadcom Corporation. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += bcm23550_w1d.o diff --git a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c index 0267582..72a32a2 100644 --- a/board/broadcom/bcm23550_w1d/bcm23550_w1d.c +++ b/board/broadcom/bcm23550_w1d/bcm23550_w1d.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2013 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/broadcom/bcm28155_ap/Makefile b/board/broadcom/bcm28155_ap/Makefile index 4bb9e70..06eba8f 100644 --- a/board/broadcom/bcm28155_ap/Makefile +++ b/board/broadcom/bcm28155_ap/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2013 Broadcom Corporation. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += bcm28155_ap.o diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c index 8f48ccb..6faeb6a 100644 --- a/board/broadcom/bcm28155_ap/bcm28155_ap.c +++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2013 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/broadcom/bcm_ep/Makefile b/board/broadcom/bcm_ep/Makefile index 8914e54..29a3ea7 100644 --- a/board/broadcom/bcm_ep/Makefile +++ b/board/broadcom/bcm_ep/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2014 Broadcom Corporation. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += board.o diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c index a409622..b2469dc 100644 --- a/board/broadcom/bcm_ep/board.c +++ b/board/broadcom/bcm_ep/board.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Broadcom Corporation. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/broadcom/bcmns2/Makefile b/board/broadcom/bcmns2/Makefile index f6ddd80..29274bd 100644 --- a/board/broadcom/bcmns2/Makefile +++ b/board/broadcom/bcmns2/Makefile @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2016 Broadcom Ltd. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := northstar2.o diff --git a/board/broadcom/bcmns2/northstar2.c b/board/broadcom/bcmns2/northstar2.c index 10279a5..1068edc 100644 --- a/board/broadcom/bcmns2/northstar2.c +++ b/board/broadcom/bcmns2/northstar2.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 Broadcom Ltd. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include #include -- cgit v1.1