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/Seagate/dockstar/Makefile | 4 +--- board/Seagate/dockstar/dockstar.c | 3 +-- board/Seagate/dockstar/dockstar.h | 3 +-- board/Seagate/dockstar/kwbimage.cfg | 4 +--- board/Seagate/goflexhome/Makefile | 4 +--- board/Seagate/goflexhome/goflexhome.c | 3 +-- board/Seagate/goflexhome/kwbimage.cfg | 4 +--- board/Seagate/nas220/nas220.c | 3 +-- 8 files changed, 8 insertions(+), 20 deletions(-) (limited to 'board/Seagate') diff --git a/board/Seagate/dockstar/Makefile b/board/Seagate/dockstar/Makefile index 2ef5093..7fda3f4 100644 --- a/board/Seagate/dockstar/Makefile +++ b/board/Seagate/dockstar/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2010 Eric C. Cooper # @@ -5,8 +6,5 @@ # Prafulla Wadaskar # (C) Copyright 2009 # Marvell Semiconductor -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := dockstar.o diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c index f444c16..40e5dc7 100644 --- a/board/Seagate/dockstar/dockstar.c +++ b/board/Seagate/dockstar/dockstar.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2010 Eric C. Cooper * @@ -5,8 +6,6 @@ * Prafulla Wadaskar * (C) Copyright 2009 * Marvell Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/Seagate/dockstar/dockstar.h b/board/Seagate/dockstar/dockstar.h index ec6fa25..cbb1644 100644 --- a/board/Seagate/dockstar/dockstar.h +++ b/board/Seagate/dockstar/dockstar.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2010 Eric C. Cooper * @@ -5,8 +6,6 @@ * Prafulla Wadaskar * (C) Copyright 2009 * Marvell Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __DOCKSTAR_H diff --git a/board/Seagate/dockstar/kwbimage.cfg b/board/Seagate/dockstar/kwbimage.cfg index e68ce64..65183d4 100644 --- a/board/Seagate/dockstar/kwbimage.cfg +++ b/board/Seagate/dockstar/kwbimage.cfg @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2010 Eric C. Cooper # @@ -5,9 +6,6 @@ # Prafulla Wadaskar # (C) Copyright 2009 # Marvell Semiconductor -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer doc/README.kwbimage for more details about how-to configure # and create kirkwood boot image # diff --git a/board/Seagate/goflexhome/Makefile b/board/Seagate/goflexhome/Makefile index e56230c..d6e6b97 100644 --- a/board/Seagate/goflexhome/Makefile +++ b/board/Seagate/goflexhome/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2013 Suriyan Ramasami # @@ -8,8 +9,5 @@ # Prafulla Wadaskar # (C) Copyright 2009 # Marvell Semiconductor -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y := goflexhome.o diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c index 5d0a424..42b51eb 100644 --- a/board/Seagate/goflexhome/goflexhome.c +++ b/board/Seagate/goflexhome/goflexhome.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Suriyan Ramasami * @@ -8,8 +9,6 @@ * Prafulla Wadaskar * (C) Copyright 2009 * Marvell Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/Seagate/goflexhome/kwbimage.cfg b/board/Seagate/goflexhome/kwbimage.cfg index 9d147ea..8c81931 100644 --- a/board/Seagate/goflexhome/kwbimage.cfg +++ b/board/Seagate/goflexhome/kwbimage.cfg @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2013 Suriyan Ramasami # @@ -8,9 +9,6 @@ # Prafulla Wadaskar # (C) Copyright 2009 # Marvell Semiconductor -# -# SPDX-License-Identifier: GPL-2.0+ -# # Refer docs/README.kwimage for more details about how-to configure # and create kirkwood boot image # diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c index 18c2895..1e6c43b 100644 --- a/board/Seagate/nas220/nas220.c +++ b/board/Seagate/nas220/nas220.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014 Evgeni Dobrev * @@ -5,8 +6,6 @@ * Prafulla Wadaskar * (C) Copyright 2009 * Marvell Semiconductor - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.1