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/congatec/Kconfig | 4 +--- board/congatec/cgtqmx6eval/Makefile | 4 +--- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 3 +-- board/congatec/conga-qeval20-qa3-e3845/Makefile | 4 +--- board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl | 3 +-- board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c | 3 +-- board/congatec/conga-qeval20-qa3-e3845/dsdt.asl | 3 +-- board/congatec/conga-qeval20-qa3-e3845/start.S | 3 +-- 8 files changed, 8 insertions(+), 19 deletions(-) (limited to 'board/congatec') diff --git a/board/congatec/Kconfig b/board/congatec/Kconfig index fb341bf24c..e9fa153755 100644 --- a/board/congatec/Kconfig +++ b/board/congatec/Kconfig @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Bin Meng -# -# SPDX-License-Identifier: GPL-2.0+ -# if VENDOR_CONGATEC diff --git a/board/congatec/cgtqmx6eval/Makefile b/board/congatec/cgtqmx6eval/Makefile index 1bce4737f0..2c45ca0e12 100644 --- a/board/congatec/cgtqmx6eval/Makefile +++ b/board/congatec/cgtqmx6eval/Makefile @@ -1,10 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2007, Guennadi Liakhovetski # # (C) Copyright 2011 Freescale Semiconductor, Inc. # (C) Copyright 2013 Adeneo Embedded -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := cgtqmx6eval.o diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 1647b61100..50124f8516 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. * Based on mx6qsabrelite.c file * Copyright (C) 2013, Adeneo Embedded * Leo Sartre, - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/congatec/conga-qeval20-qa3-e3845/Makefile b/board/congatec/conga-qeval20-qa3-e3845/Makefile index b784510f39..2f04828a27 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/Makefile +++ b/board/congatec/conga-qeval20-qa3-e3845/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += conga-qeval20-qa3.o start.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl b/board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl index eace459ae0..856960d5e2 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl +++ b/board/congatec/conga-qeval20-qa3-e3845/acpi/mainboard.asl @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016, Bin Meng - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Power Button */ diff --git a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c index 1283eebd38..9751337a47 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c +++ b/board/congatec/conga-qeval20-qa3-e3845/conga-qeval20-qa3.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Stefan Roese - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/congatec/conga-qeval20-qa3-e3845/dsdt.asl b/board/congatec/conga-qeval20-qa3-e3845/dsdt.asl index 6042011acf..d2297ef595 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/dsdt.asl +++ b/board/congatec/conga-qeval20-qa3-e3845/dsdt.asl @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2016, Bin Meng - * - * SPDX-License-Identifier: GPL-2.0+ */ DefinitionBlock("dsdt.aml", "DSDT", 2, "U-BOOT", "U-BOOTBL", 0x00010000) diff --git a/board/congatec/conga-qeval20-qa3-e3845/start.S b/board/congatec/conga-qeval20-qa3-e3845/start.S index 2c941a4a51..65d1f7e961 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/start.S +++ b/board/congatec/conga-qeval20-qa3-e3845/start.S @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2015, Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ .globl early_board_init -- cgit v1.2.1