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 --- api/Makefile | 4 +--- api/api.c | 3 +-- api/api_display.c | 2 +- api/api_net.c | 3 +-- api/api_platform-arm.c | 3 +-- api/api_platform-mips.c | 3 +-- api/api_platform-powerpc.c | 3 +-- api/api_private.h | 3 +-- api/api_storage.c | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) (limited to 'api') diff --git a/api/Makefile b/api/Makefile index 14b76085962..bd2d035fcdb 100644 --- a/api/Makefile +++ b/api/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2007 Semihalf -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-y += api.o api_display.o api_net.o api_storage.o obj-$(CONFIG_ARM) += api_platform-arm.o diff --git a/api/api.c b/api/api.c index 7eee2fc083a..9f03f1a35bb 100644 --- a/api/api.c +++ b/api/api.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007 Semihalf * * Written by: Rafal Jaworowski - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/api/api_display.c b/api/api_display.c index fe04d396929..8ae358abb14 100644 --- a/api/api_display.c +++ b/api/api_display.c @@ -1,6 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2011 The Chromium OS Authors. - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/api/api_net.c b/api/api_net.c index 80658b5bdb1..7515c26e8b4 100644 --- a/api/api_net.c +++ b/api/api_net.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007 Semihalf * * Written by: Rafal Jaworowski - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/api/api_platform-arm.c b/api/api_platform-arm.c index eb5338f66f1..6cfd9e6cc20 100644 --- a/api/api_platform-arm.c +++ b/api/api_platform-arm.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007 Semihalf * * Written by: Rafal Jaworowski * - * SPDX-License-Identifier: GPL-2.0+ - * * This file contains routines that fetch data from ARM-dependent sources * (bd_info etc.) */ diff --git a/api/api_platform-mips.c b/api/api_platform-mips.c index a75b0f6195c..51cd328b3d0 100644 --- a/api/api_platform-mips.c +++ b/api/api_platform-mips.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007 Stanislav Galabov * - * SPDX-License-Identifier: GPL-2.0+ - * * This file contains routines that fetch data from bd_info sources */ diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c index aae7ddee959..15930cfdb66 100644 --- a/api/api_platform-powerpc.c +++ b/api/api_platform-powerpc.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007 Semihalf * * Written by: Rafal Jaworowski * - * SPDX-License-Identifier: GPL-2.0+ - * * This file contains routines that fetch data from PowerPC-dependent sources * (bd_info etc.) */ diff --git a/api/api_private.h b/api/api_private.h index a8866ef6d2d..8d97ca95a2a 100644 --- a/api/api_private.h +++ b/api/api_private.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2007 Semihalf * * Written by: Rafal Jaworowski - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _API_PRIVATE_H_ diff --git a/api/api_storage.c b/api/api_storage.c index 6fc6f44925c..8aeeda2715f 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007-2008 Semihalf * * Written by: Rafal Jaworowski - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3