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>
diff --git a/doc/DocBook/Makefile b/doc/DocBook/Makefile
index 9caa512..820b1fb 100644
--- a/doc/DocBook/Makefile
+++ b/doc/DocBook/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
###
# This makefile is used to generate the kernel documentation,
# primarily based on in-line comments in various source files.
@@ -5,9 +6,6 @@
# to document the SRC - and how to read it.
# To add a new book the only step required is to add the book to the
# list of DOCBOOKS.
-#
-# SPDX-License-Identifier: GPL-2.0
-#
DOCBOOKS := linker_lists.xml stdio.xml
diff --git a/doc/README.autoboot b/doc/README.autoboot
index 30fd0b0..eeb7e4c 100644
--- a/doc/README.autoboot
+++ b/doc/README.autoboot
@@ -1,8 +1,8 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2001
* Dave Ellis, SIXNET, dge@sixnetio.com
*
- * SPDX-License-Identifier: GPL-2.0+
*/
Using autoboot configuration options
diff --git a/doc/README.bootmenu b/doc/README.bootmenu
index af22a13..34ff8d5 100644
--- a/doc/README.bootmenu
+++ b/doc/README.bootmenu
@@ -1,7 +1,6 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2011-2012 Pali Rohár <pali.rohar@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
ANSI terminal bootmenu command
diff --git a/doc/README.bus_vcxk b/doc/README.bus_vcxk
index 5bd3c65..aaa1565 100644
--- a/doc/README.bus_vcxk
+++ b/doc/README.bus_vcxk
@@ -1,9 +1,8 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2008-2009
* BuS Elektronik GmbH & Co. KG <www.bus-elektronik.de>
* Jens Scharsig <esw@bus-elektronik.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
U-Boot vcxk video controller driver
diff --git a/doc/README.console b/doc/README.console
index aadf596..02428fb 100644
--- a/doc/README.console
+++ b/doc/README.console
@@ -1,8 +1,7 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000
* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
U-Boot console handling
diff --git a/doc/README.dfutftp b/doc/README.dfutftp
index 66901e1..127d2d6 100644
--- a/doc/README.dfutftp
+++ b/doc/README.dfutftp
@@ -1,10 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2015
#
# Lukasz Majewski <l.majewski@majess.pl>
-#
-#
-# SPDX-License-Identifier: GPL-2.0+
Device Firmware Upgrade (DFU) - extension to use TFTP
=====================================================
diff --git a/doc/README.distro b/doc/README.distro
index 522deb3..f8e9752 100644
--- a/doc/README.distro
+++ b/doc/README.distro
@@ -1,9 +1,8 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2014 Red Hat Inc.
* Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved.
* Copyright (C) 2015 K. Merker <merker@debian.org>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
Generic Distro Configuration Concept
diff --git a/doc/README.esbc_validate b/doc/README.esbc_validate
index 941b607..5409232 100644
--- a/doc/README.esbc_validate
+++ b/doc/README.esbc_validate
@@ -1,7 +1,6 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2015
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
esbc_validate command
diff --git a/doc/README.fdt-control b/doc/README.fdt-control
index 378b06b..634a106 100644
--- a/doc/README.fdt-control
+++ b/doc/README.fdt-control
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2011 The Chromium OS Authors.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
Device Tree Control in U-Boot
=============================
diff --git a/doc/README.generic-board b/doc/README.generic-board
index 6858c4d..32ddb1d 100644
--- a/doc/README.generic-board
+++ b/doc/README.generic-board
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2014 Google, Inc
# Simon Glass <sjg@chromium.org>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
Background
----------
diff --git a/doc/README.gpt b/doc/README.gpt
index d3db8bc..62013a3 100644
--- a/doc/README.gpt
+++ b/doc/README.gpt
@@ -1,10 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2012 Samsung Electronics
#
# Lukasz Majewski <l.majewski@samsung.com>
-#
-#
-# SPDX-License-Identifier: GPL-2.0+
Glossary:
========
diff --git a/doc/README.iomux b/doc/README.iomux
index 044240d..c428811 100644
--- a/doc/README.iomux
+++ b/doc/README.iomux
@@ -1,8 +1,7 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2008
* Gary Jennejohn, DENX Software Engineering GmbH <garyj@denx.de>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
U-Boot console multiplexing
diff --git a/doc/README.menu b/doc/README.menu
index cf14231..450c6a8 100644
--- a/doc/README.menu
+++ b/doc/README.menu
@@ -1,7 +1,6 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2010-2011 Calxeda, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
U-Boot provides a set of interfaces for creating and using simple, text
diff --git a/doc/README.nand b/doc/README.nand
index 362b8d8..cda11b4 100644
--- a/doc/README.nand
+++ b/doc/README.nand
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0+
NAND FLASH commands and notes
See NOTE below!!!
@@ -5,7 +6,6 @@
# (C) Copyright 2003
# Dave Ellis, SIXNET, dge@sixnetio.com
#
-# SPDX-License-Identifier: GPL-2.0+
Commands:
diff --git a/doc/README.nvme b/doc/README.nvme
index d9bda23..e8f9be1 100644
--- a/doc/README.nvme
+++ b/doc/README.nvme
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2017 NXP Semiconductors
# Copyright (C) 2017 Bin Meng <bmeng.cn@gmail.com>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
What is NVMe
============
diff --git a/doc/README.pxe b/doc/README.pxe
index db11658..98862cd 100644
--- a/doc/README.pxe
+++ b/doc/README.pxe
@@ -1,7 +1,6 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2010-2011 Calxeda, Inc.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
The 'pxe' commands provide a near subset of the functionality provided by
diff --git a/doc/README.qemu-arm b/doc/README.qemu-arm
index aee7894..6f6f07d 100644
--- a/doc/README.qemu-arm
+++ b/doc/README.qemu-arm
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2017, Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
U-Boot on QEMU's 'virt' machine on ARM & AArch64
================================================
diff --git a/doc/README.rockchip b/doc/README.rockchip
index 597f068..d35071d 100644
--- a/doc/README.rockchip
+++ b/doc/README.rockchip
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2015 Google. Inc
# Written by Simon Glass <sjg@chromium.org>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
U-Boot on Rockchip
==================
diff --git a/doc/README.semihosting b/doc/README.semihosting
index c016a4f..c019999 100644
--- a/doc/README.semihosting
+++ b/doc/README.semihosting
@@ -1,7 +1,6 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2014 Broadcom Corporation.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
Semihosting is ARM's way of having a real or virtual target communicate
diff --git a/doc/README.trace b/doc/README.trace
index f0c9699..74ba26a 100644
--- a/doc/README.trace
+++ b/doc/README.trace
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (c) 2013 The Chromium OS Authors.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
Tracing in U-Boot
=================
diff --git a/doc/README.u-boot_on_efi b/doc/README.u-boot_on_efi
index 298b94e..d5903c7 100644
--- a/doc/README.u-boot_on_efi
+++ b/doc/README.u-boot_on_efi
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2015 Google, Inc
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
U-Boot on EFI
=============
diff --git a/doc/README.usb b/doc/README.usb
index 6e46345..05c62c3 100644
--- a/doc/README.usb
+++ b/doc/README.usb
@@ -1,8 +1,7 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2001
* Denis Peter, MPL AG Switzerland
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
USB Support
diff --git a/doc/README.video b/doc/README.video
index e7ae98a..09a26b1 100644
--- a/doc/README.video
+++ b/doc/README.video
@@ -1,8 +1,7 @@
+SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000
* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
"video-mode" environment variable
diff --git a/doc/README.vxworks b/doc/README.vxworks
index 3239c5b..1aa8e44 100644
--- a/doc/README.vxworks
+++ b/doc/README.vxworks
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2013, Miao Yan <miao.yan@windriver.com>
# Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
VxWorks Support
===============
diff --git a/doc/README.x86 b/doc/README.x86
index b1663a4..04f0220 100644
--- a/doc/README.x86
+++ b/doc/README.x86
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2014, Simon Glass <sjg@chromium.org>
# Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
U-Boot on x86
=============
diff --git a/doc/README.zynq b/doc/README.zynq
index cc5c0de..5b0672c 100644
--- a/doc/README.zynq
+++ b/doc/README.zynq
@@ -1,10 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# Xilinx ZYNQ U-Boot
#
# (C) Copyright 2013 Xilinx, Inc.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
1. About this
diff --git a/doc/driver-model/remoteproc-framework.txt b/doc/driver-model/remoteproc-framework.txt
index 094e98b..c6dc00d 100644
--- a/doc/driver-model/remoteproc-framework.txt
+++ b/doc/driver-model/remoteproc-framework.txt
@@ -1,7 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2015
# Texas Instruments Incorporated - http://www.ti.com/
-# SPDX-License-Identifier: GPL-2.0+
#
Remote Processor Framework