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/advantech/dms-ba16/Makefile | 4 +--- board/advantech/dms-ba16/dms-ba16.c | 3 +-- board/advantech/dms-ba16/dms-ba16_1g.cfg | 3 +-- board/advantech/dms-ba16/dms-ba16_2g.cfg | 3 +-- board/advantech/som-db5800-som-6867/Makefile | 4 +--- board/advantech/som-db5800-som-6867/acpi/mainboard.asl | 3 +-- board/advantech/som-db5800-som-6867/dsdt.asl | 3 +-- board/advantech/som-db5800-som-6867/som-db5800-som-6867.c | 3 +-- board/advantech/som-db5800-som-6867/start.S | 3 +-- 9 files changed, 9 insertions(+), 20 deletions(-) (limited to 'board/advantech') diff --git a/board/advantech/dms-ba16/Makefile b/board/advantech/dms-ba16/Makefile index ec9aaa8508..b87fc29f06 100644 --- a/board/advantech/dms-ba16/Makefile +++ b/board/advantech/dms-ba16/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2016 Timesys Corporation # Copyright 2016 Advantech Corporation -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := dms-ba16.o diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c index 6fe74714cc..09620435d3 100644 --- a/board/advantech/dms-ba16/dms-ba16.c +++ b/board/advantech/dms-ba16/dms-ba16.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Timesys Corporation * Copyright 2016 Advantech Corporation * Copyright 2012 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/advantech/dms-ba16/dms-ba16_1g.cfg b/board/advantech/dms-ba16/dms-ba16_1g.cfg index d5de1fd751..c2624ddc3e 100644 --- a/board/advantech/dms-ba16/dms-ba16_1g.cfg +++ b/board/advantech/dms-ba16/dms-ba16_1g.cfg @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * * Copyright 2015 Timesys Corporation. * Copyright 2015 General Electric Company * - * SPDX-License-Identifier: GPL-2.0+ - * * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image * diff --git a/board/advantech/dms-ba16/dms-ba16_2g.cfg b/board/advantech/dms-ba16/dms-ba16_2g.cfg index a731af60e8..4ce93ff74b 100644 --- a/board/advantech/dms-ba16/dms-ba16_2g.cfg +++ b/board/advantech/dms-ba16/dms-ba16_2g.cfg @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * * Copyright 2015 Timesys Corporation. * Copyright 2015 General Electric Company * - * SPDX-License-Identifier: GPL-2.0+ - * * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image * diff --git a/board/advantech/som-db5800-som-6867/Makefile b/board/advantech/som-db5800-som-6867/Makefile index 9837aa0c79..0524766bb7 100644 --- a/board/advantech/som-db5800-som-6867/Makefile +++ b/board/advantech/som-db5800-som-6867/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015, Google, Inc -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += som-db5800-som-6867.o start.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/advantech/som-db5800-som-6867/acpi/mainboard.asl b/board/advantech/som-db5800-som-6867/acpi/mainboard.asl index 21785ea73b..beb9d93ec9 100644 --- a/board/advantech/som-db5800-som-6867/acpi/mainboard.asl +++ b/board/advantech/som-db5800-som-6867/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/advantech/som-db5800-som-6867/dsdt.asl b/board/advantech/som-db5800-som-6867/dsdt.asl index 6042011acf..d2297ef595 100644 --- a/board/advantech/som-db5800-som-6867/dsdt.asl +++ b/board/advantech/som-db5800-som-6867/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/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c index 202e987539..ac12f303a3 100644 --- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c +++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Stefan Roese * Copyright (C) 2016 George McCollister - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/advantech/som-db5800-som-6867/start.S b/board/advantech/som-db5800-som-6867/start.S index 2c941a4a51..65d1f7e961 100644 --- a/board/advantech/som-db5800-som-6867/start.S +++ b/board/advantech/som-db5800-som-6867/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