aboutsummaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-06 17:58:06 -0400
committerTom Rini <trini@konsulko.com>2018-05-07 09:34:12 -0400
commit83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch)
tree5e5d1b40b52aaf96b707e0da2474573306d22f7b /drivers/block
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
downloadu-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.zip
u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz
u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.bz2
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 <trini@konsulko.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/Makefile4
-rw-r--r--drivers/block/blk-uclass.c3
-rw-r--r--drivers/block/blk_legacy.c3
-rw-r--r--drivers/block/blkcache.c3
-rw-r--r--drivers/block/ide.c3
-rw-r--r--drivers/block/sandbox.c3
6 files changed, 6 insertions, 13 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 3d52bd8..5fcafb1 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 c32aee6..9e0c823 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 <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index ab42bf7..0c343f7 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 <sjg@chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/drivers/block/blkcache.c b/drivers/block/blkcache.c
index 46a6059..294511f 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<eric@nelint.com>
*
- * SPDX-License-Identifier: GPL-2.0+
- *
*/
#include <config.h>
#include <common.h>
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 9ab01a9..38adb6a 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 <common.h>
diff --git a/drivers/block/sandbox.c b/drivers/block/sandbox.c
index 98df6b3..0392437 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 <henrik@henriknordstrom.net>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>