summaryrefslogtreecommitdiff
path: root/disk
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 /disk
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
downloadu-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz
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 'disk')
-rw-r--r--disk/Makefile4
-rw-r--r--disk/part.c3
-rw-r--r--disk/part_amiga.c3
-rw-r--r--disk/part_amiga.h3
-rw-r--r--disk/part_dos.c3
-rw-r--r--disk/part_dos.h3
-rw-r--r--disk/part_efi.c3
-rw-r--r--disk/part_iso.c3
-rw-r--r--disk/part_iso.h3
-rw-r--r--disk/part_mac.c3
-rw-r--r--disk/part_mac.h3
11 files changed, 11 insertions, 23 deletions
diff --git a/disk/Makefile b/disk/Makefile
index 12c0531689..ccd0335959 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2000-2006
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
#ccflags-y += -DET_DEBUG -DDEBUG
diff --git a/disk/part.c b/disk/part.c
index e31aca4877..9266a09ec3 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2001
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index 1b7d915138..86d008d476 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2001
* Hans-Joerg Frieden, Hyperion Entertainment
* Hans-JoergF@hyperion-entertainment.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <command.h>
diff --git a/disk/part_amiga.h b/disk/part_amiga.h
index a3fe1a96d8..42f5eb0f94 100644
--- a/disk/part_amiga.h
+++ b/disk/part_amiga.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Hans-Joerg Frieden, Hyperion Entertainment
* Hans-JoergF@hyperion-entertainment.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DISK_PART_AMIGA_H
diff --git a/disk/part_dos.c b/disk/part_dos.c
index 84e672b47b..936cee0d36 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2001
* Raymond Lo, lo@routefree.com
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/disk/part_dos.h b/disk/part_dos.h
index 0321d922b7..434b021ae8 100644
--- a/disk/part_dos.h
+++ b/disk/part_dos.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _DISK_PART_DOS_H
diff --git a/disk/part_efi.c b/disk/part_efi.c
index fb221eec09..72e3997b84 100644
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2008 RuggedCom, Inc.
* Richard Retanubun <RichardRetanubun@RuggedCom.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/disk/part_iso.c b/disk/part_iso.c
index ef582de7a1..e733227f59 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2001
* Denis Peter, MPL AG Switzerland, d.peter@mpl.ch.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
diff --git a/disk/part_iso.h b/disk/part_iso.h
index 045784f4d4..eb2c3ab66f 100644
--- a/disk/part_iso.h
+++ b/disk/part_iso.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Denis Peter, MPL AG Switzerland, d.peter@mpl.ch.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _PART_CD_H
#define _PART_CD_H
diff --git a/disk/part_mac.c b/disk/part_mac.c
index e65930d8e7..8b2c004027 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
diff --git a/disk/part_mac.h b/disk/part_mac.h
index 6735144029..5f396c9408 100644
--- a/disk/part_mac.h
+++ b/disk/part_mac.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*