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/varisys/common/Makefile | 4 +--- board/varisys/common/sys_eeprom.c | 3 +-- board/varisys/cyrus/Makefile | 4 +--- board/varisys/cyrus/cyrus.c | 3 +-- board/varisys/cyrus/cyrus.h | 4 +--- board/varisys/cyrus/ddr.c | 3 +-- board/varisys/cyrus/eth.c | 3 +-- board/varisys/cyrus/law.c | 3 +-- board/varisys/cyrus/pci.c | 3 +-- board/varisys/cyrus/tlb.c | 3 +-- 10 files changed, 10 insertions(+), 23 deletions(-) (limited to 'board/varisys') diff --git a/board/varisys/common/Makefile b/board/varisys/common/Makefile index 1e6dcbb6de..b7358c7c64 100644 --- a/board/varisys/common/Makefile +++ b/board/varisys/common/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# MINIMAL= diff --git a/board/varisys/common/sys_eeprom.c b/board/varisys/common/sys_eeprom.c index 69f596a4cc..dea9af9b5d 100644 --- a/board/varisys/common/sys_eeprom.c +++ b/board/varisys/common/sys_eeprom.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Based on board/freescale/common/sys_eeprom.c * Copyright 2006, 2008-2009, 2011 Freescale Semiconductor @@ -7,8 +8,6 @@ * Freescale API, but has a number of key differences. Because * the two APIs are independent and may diverge further, the * Varisys version of the API is implemented separately here. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/varisys/cyrus/Makefile b/board/varisys/cyrus/Makefile index a7978a0d53..15b3fb2964 100644 --- a/board/varisys/cyrus/Makefile +++ b/board/varisys/cyrus/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ obj-y += $(BOARD).o obj-y += ddr.o diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c index 1daea066a3..4ccce8a736 100644 --- a/board/varisys/cyrus/cyrus.c +++ b/board/varisys/cyrus/cyrus.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Based on corenet_ds.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/varisys/cyrus/cyrus.h b/board/varisys/cyrus/cyrus.h index 8cd52ba3c5..df037a59a0 100644 --- a/board/varisys/cyrus/cyrus.h +++ b/board/varisys/cyrus/cyrus.h @@ -1,6 +1,4 @@ -/* - * SPDX-License-Identifier: GPL-2.0+ - */ +/* SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CYRUS_H #define __CYRUS_H diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c index 2ba7b3a3ea..cac00e0467 100644 --- a/board/varisys/cyrus/ddr.c +++ b/board/varisys/cyrus/ddr.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Based on corenet_ds ddr code - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/varisys/cyrus/eth.c b/board/varisys/cyrus/eth.c index fc2192a4d2..9783abd659 100644 --- a/board/varisys/cyrus/eth.c +++ b/board/varisys/cyrus/eth.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Author Adrian Cox * Based somewhat on board/freescale/corenet_ds/eth_hydra.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/varisys/cyrus/law.c b/board/varisys/cyrus/law.c index 91e1d85246..8b1b118b55 100644 --- a/board/varisys/cyrus/law.c +++ b/board/varisys/cyrus/law.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Author: Adrian Cox * Based on corenet_ds law files. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c index 1853b197e7..a2df928fc5 100644 --- a/board/varisys/cyrus/pci.c +++ b/board/varisys/cyrus/pci.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2007-2011 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/varisys/cyrus/tlb.c b/board/varisys/cyrus/tlb.c index 3fa58644bb..b1af3e04d6 100644 --- a/board/varisys/cyrus/tlb.c +++ b/board/varisys/cyrus/tlb.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Author: Adrian Cox * Based on corenet_ds tlb code - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit