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 --- drivers/block/Makefile | 4 +--- drivers/block/blk-uclass.c | 3 +-- drivers/block/blk_legacy.c | 3 +-- drivers/block/blkcache.c | 3 +-- drivers/block/ide.c | 3 +-- drivers/block/sandbox.c | 3 +-- 6 files changed, 6 insertions(+), 13 deletions(-) (limited to 'drivers/block') diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 3d52bd8f46..5fcafb193e 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# obj-$(CONFIG_$(SPL_)BLK) += blk-uclass.o diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index c32aee6760..9e0c823969 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c index ab42bf76d7..0c343f7b64 100644 --- a/drivers/block/blk_legacy.c +++ b/drivers/block/blk_legacy.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Google, Inc * Written by Simon Glass - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/drivers/block/blkcache.c b/drivers/block/blkcache.c index 46a6059321..294511fcdb 100644 --- a/drivers/block/blkcache.c +++ b/drivers/block/blkcache.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) Nelson Integration, LLC 2016 * Author: Eric Nelson * - * SPDX-License-Identifier: GPL-2.0+ - * */ #include #include diff --git a/drivers/block/ide.c b/drivers/block/ide.c index 9ab01a9861..38adb6a241 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2011 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c index 98df6b33b6..0392437309 100644 --- a/drivers/block/sandbox.c +++ b/drivers/block/sandbox.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2013 Henrik Nordstrom - * - * SPDX-License-Identifier: GPL-2.0+ */ #include -- cgit v1.2.3