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/dfi/dfi-bt700/Makefile | 4 +--- board/dfi/dfi-bt700/acpi/mainboard.asl | 3 +-- board/dfi/dfi-bt700/dfi-bt700.c | 3 +-- board/dfi/dfi-bt700/dsdt.asl | 3 +-- board/dfi/dfi-bt700/start.S | 3 +-- 5 files changed, 5 insertions(+), 11 deletions(-) (limited to 'board/dfi/dfi-bt700') diff --git a/board/dfi/dfi-bt700/Makefile b/board/dfi/dfi-bt700/Makefile index 8052f5e02f..99cf357b70 100644 --- a/board/dfi/dfi-bt700/Makefile +++ b/board/dfi/dfi-bt700/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += dfi-bt700.o start.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/dfi/dfi-bt700/acpi/mainboard.asl b/board/dfi/dfi-bt700/acpi/mainboard.asl index 544a04915e..4863fbf6d9 100644 --- a/board/dfi/dfi-bt700/acpi/mainboard.asl +++ b/board/dfi/dfi-bt700/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/dfi/dfi-bt700/dfi-bt700.c b/board/dfi/dfi-bt700/dfi-bt700.c index 3dd2036d11..50cf6dc987 100644 --- a/board/dfi/dfi-bt700/dfi-bt700.c +++ b/board/dfi/dfi-bt700/dfi-bt700.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/dfi/dfi-bt700/dsdt.asl b/board/dfi/dfi-bt700/dsdt.asl index 6042011acf..d2297ef595 100644 --- a/board/dfi/dfi-bt700/dsdt.asl +++ b/board/dfi/dfi-bt700/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/dfi/dfi-bt700/start.S b/board/dfi/dfi-bt700/start.S index 2c941a4a51..65d1f7e961 100644 --- a/board/dfi/dfi-bt700/start.S +++ b/board/dfi/dfi-bt700/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.3