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>

20 files changed, 20 insertions, 42 deletions

diff --git a/common/spl/Makefile b/common/spl/Makefile
index 9bf8a2d81a..814081feda 100644
--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -1,10 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2012
 # Texas Instruments Incorporated - http://www.ti.com/
 # Aneesh V <aneesh@ti.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 # Based on common/Makefile.
 #
 
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 794dbd0312..3dafeaed3a 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2010
  * Texas Instruments, <www.ti.com>
  *
  * Aneesh V <aneesh@ti.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index 5f9aa95e30..cddab6a735 100644
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * Reference to the ARM TF Project,
  * plat/arm/common/arm_bl2_setup.c
@@ -6,8 +7,6 @@
  * Copyright (C) 2016 Rockchip Electronic Co.,Ltd
  * Written by Kever Yang <kever.yang@rock-chips.com>
  * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     BSD-3-Clause
  */
 
 #include <common.h>
diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c
index 6804246d03..076f5d8d93 100644
--- a/common/spl/spl_bootrom.c
+++ b/common/spl/spl_bootrom.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Theobroma Systems Design und Consulting GmH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c
index 05bb21035d..b8e3a6c89e 100644
--- a/common/spl/spl_dfu.c
+++ b/common/spl/spl_dfu.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2016
  * Texas Instruments, <www.ti.com>
  *
  * Ravi B <ravibabu@ti.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <spl.h>
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c
index 559ba0b797..fd30a61f9a 100644
--- a/common/spl/spl_ext.c
+++ b/common/spl/spl_ext.c
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier:	GPL-2.0+
- */
+// SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
 #include <spl.h>
diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 59a85a986a..87dd553210 100644
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014
  * Texas Instruments, <www.ti.com>
  *
  * Dan Murphy <dmurphy@ti.com>
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * FAT Image Functions copied from spl_mmc.c
  */
 
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 9f03e2648a..8b5befcec2 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.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/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index e780b82fd2..db5be3dfa5 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2010
  * Texas Instruments, <www.ti.com>
  *
  * Aneesh V <aneesh@ti.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <dm.h>
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index d075985374..9a52500614 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011
  * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <config.h>
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index 33f3b74a97..b6967ff69e 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2012
  * Ilya Yanok <ilya.yanok@gmail.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <errno.h>
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 1ef8ac8b89..bb6194fafd 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c
index fc98e9cbe5..d32333935a 100644
--- a/common/spl/spl_onenand.c
+++ b/common/spl/spl_onenand.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013
  * ISEE 2007 SL - Enric Balletbo i Serra <eballetbo@iseebcn.com>
@@ -5,8 +6,6 @@
  * Based on common/spl/spl_nand.c
  * Copyright (C) 2011
  * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <config.h>
diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index a15761e309..e8701934b8 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2016
  * Xilinx, Inc.
@@ -7,8 +8,6 @@
  *
  * Michal Simek <michal.simek@xilinx.com>
  * Stefan Agner <stefan.agner@toradex.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <binman_sym.h>
diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 357f8e5bd9..adfce1d527 100644
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2013
  * Texas Instruments, <www.ti.com>
  *
  * Dan Murphy <dmurphy@ti.com>
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Derived work from spl_usb.c
  */
 
diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index 69390edcba..807256e908 100644
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2016 Toradex
  * Author: Stefan Agner <stefan.agner@toradex.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 42880d56b9..df46046729 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 OMICRON electronics GmbH
  *
@@ -5,8 +6,6 @@
  *
  * Copyright (C) 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index 5aac10bd57..c8d8231895 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014
  * Texas Instruments, <www.ti.com>
  *
  * Dan Murphy <dmurphy@ti.com>
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Derived work from spl_mmc.c
  */
 
diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c
index 3f6420ba1e..1af4da8725 100644
--- a/common/spl/spl_xip.c
+++ b/common/spl/spl_xip.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
  * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 4ab3dcd624..35f8f80013 100644
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -6,8 +7,6 @@
  * Texas Instruments, <www.ti.com>
  *
  * Matt Porter <mporter@ti.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <spl.h>