summaryrefslogtreecommitdiff
path: root/doc
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 /doc
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
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 'doc')
-rw-r--r--doc/DocBook/Makefile4
-rw-r--r--doc/README.autoboot2
-rw-r--r--doc/README.bootmenu3
-rw-r--r--doc/README.bus_vcxk3
-rw-r--r--doc/README.console3
-rw-r--r--doc/README.dfutftp4
-rw-r--r--doc/README.distro3
-rw-r--r--doc/README.esbc_validate3
-rw-r--r--doc/README.fdt-control4
-rw-r--r--doc/README.generic-board4
-rw-r--r--doc/README.gpt4
-rw-r--r--doc/README.iomux3
-rw-r--r--doc/README.menu3
-rw-r--r--doc/README.nand2
-rw-r--r--doc/README.nvme4
-rw-r--r--doc/README.pxe3
-rw-r--r--doc/README.qemu-arm4
-rw-r--r--doc/README.rockchip4
-rw-r--r--doc/README.semihosting3
-rw-r--r--doc/README.trace4
-rw-r--r--doc/README.u-boot_on_efi4
-rw-r--r--doc/README.usb3
-rw-r--r--doc/README.video3
-rw-r--r--doc/README.vxworks4
-rw-r--r--doc/README.x864
-rw-r--r--doc/README.zynq4
-rw-r--r--doc/driver-model/remoteproc-framework.txt2
27 files changed, 27 insertions, 64 deletions
diff --git a/doc/DocBook/Makefile b/doc/DocBook/Makefile
index 9caa512608..820b1fb60f 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 30fd0b0e88..eeb7e4c662 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 af22a139cd..34ff8d5ecc 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 5bd3c652a2..aaa1565dde 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 aadf596a8a..02428fb396 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 66901e1577..127d2d6abc 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 522deb3232..f8e9752a0f 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 941b60724d..540923215e 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 378b06b108..634a10616f 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 6858c4daaf..32ddb1d19a 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 d3db8bce1c..62013a3f89 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 044240db3f..c428811ce4 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 cf142314d3..450c6a83a7 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 362b8d8c9f..cda11b43ff 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 @@ See NOTE below!!!
# (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 d9bda23fe4..e8f9be149e 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 db1165838c..98862cdfde 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 aee789447a..6f6f07d8bb 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 597f068aca..d35071d653 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 c016a4f840..c019999bed 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 f0c9699773..74ba26a5a4 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 298b94e342..d5903c7bd3 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 6e46345cab..05c62c3413 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 e7ae98aa5d..09a26b1793 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 3239c5bb11..1aa8e44f42 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 b1663a4111..04f02202b4 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 cc5c0de217..5b0672c503 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 094e98bba6..c6dc00dca3 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
generated by cgit v1.2.3 (git 2.0.4) at 2024-05-21 02:41:38 +0000