SPDX: Convert all of our multiple 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 multiple licenses (in
these cases, dual license) declared in the SPDX-License-Identifier tag.
In this case we change from listing "LICENSE-A LICENSE-B" or "LICENSE-A
or LICENSE-B" or "(LICENSE-A OR LICENSE-B)" to "LICENSE-A OR LICENSE-B"
as per the Linux Kernel style document.  Note that parenthesis are
allowed so when they were used before we continue to use them.

Reviewed-by: Fabio Estevam <[email protected]>
Signed-off-by: Tom Rini <[email protected]>

arch/arm/dts/bk4r1.dts

@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2016 Toradex AG
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1012a-frdm.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree file for Freescale Layerscape-1012A family SoC.
  *
  * Copyright 2016, Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1012a-frdm.dtsi

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree file for Freescale Layerscape-1012A family SoC.
  *
  * Copyright 2016, Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /include/ "fsl-ls1012a.dtsi"

arch/arm/dts/fsl-ls1012a-qds.dts

@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2016 Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1012a-qds.dtsi

@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2016 Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /include/ "fsl-ls1012a.dtsi"

arch/arm/dts/fsl-ls1012a-rdb.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree file for Freescale Layerscape-1012A family SoC.
  *
  * Copyright 2016, Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1012a-rdb.dtsi

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree Include file for Freescale Layerscape-1012A family SoC.
  *
  * Copyright 2016, Freescale Semiconductor
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /include/ "fsl-ls1012a.dtsi"

arch/arm/dts/fsl-ls1012a.dtsi

@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2016 Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /include/ "skeleton64.dtsi"

arch/arm/dts/fsl-ls1043a-qds-duart.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree file for Freescale Layerscape-1043A family SoC.
  *
  * Copyright (C) 2015, Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1043a-qds-lpuart.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree file for Freescale Layerscape-1043A family SoC.
  *
  * Copyright (C) 2015, Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1043a-qds.dtsi

@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree Include file for Freescale Layerscape-1043A family SoC.
  *
  * Copyright (C) 2015, Freescale Semiconductor
  *
  * Mingkai Hu <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /include/ "fsl-ls1043a.dtsi"

arch/arm/dts/fsl-ls1043a-rdb.dts

@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree Include file for Freescale Layerscape-1043A family SoC.
  *
  * Copyright (C) 2015, Freescale Semiconductor
  *
  * Mingkai Hu <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1043a.dtsi

@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree Include file for Freescale Layerscape-1043A family SoC.
  *
  * Copyright (C) 2014-2015, Freescale Semiconductor
  *
  * Mingkai Hu <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /include/ "skeleton64.dtsi"

arch/arm/dts/fsl-ls1046a-qds-duart.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree file for Freescale Layerscape-1046A family SoC.
  *
  * Copyright (C) 2016, Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1046a-qds-lpuart.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree file for Freescale Layerscape-1046A family SoC.
  *
  * Copyright (C) 2016, Freescale Semiconductor
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1046a-qds.dtsi

@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree Include file for Freescale Layerscape-1046A family SoC.
  *
  * Copyright (C) 2016, Freescale Semiconductor
  *
  * Mingkai Hu <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /include/ "fsl-ls1046a.dtsi"

arch/arm/dts/fsl-ls1046a-rdb.dts

@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree Include file for Freescale Layerscape-1046A family SoC.
  *
  * Copyright 2016, Freescale Semiconductor
  *
  * Mingkai Hu <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1046a.dtsi

@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree Include file for Freescale Layerscape-1046A family SoC.
  *
  * Copyright (C) 2016, Freescale Semiconductor
  *
  * Mingkai Hu <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /include/ "skeleton64.dtsi"

arch/arm/dts/fsl-ls1088a-qds.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * NXP ls1088a QDS board device tree source
  *
  * Copyright 2017 NXP
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1088a-rdb.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * NXP ls1088a RDB board device tree source
  *
  * Copyright 2017 NXP
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1088a.dtsi

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * NXP ls1088a SOC common device tree source
  *
  * Copyright 2017 NXP
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 / {

arch/arm/dts/fsl-ls2080a-qds.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Freescale ls2080a QDS board device tree source
  *
  * Copyright 2013-2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls2080a-rdb.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Freescale ls2080a RDB board device tree source
  *
  * Copyright 2013-2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls2080a.dtsi

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Freescale ls2080a SOC common device tree source
  *
  * Copyright 2013-2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 / {

arch/arm/dts/fsl-ls2081a-rdb.dts

@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * NXP LS2081A RDB board device tree source for QSPI-boot
  *
  * Author: Priyanka Jain <[email protected]>
  *
  * Copyright 2017 NXP
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls2088a-rdb-qspi.dts

@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * NXP ls2080a RDB board device tree source for QSPI-boot
  *
  * Author: Priyanka Jain <[email protected]>
  *
  * Copyright 2017 NXP
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/imx53-cx9020.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2016 Beckhoff Automation
  * Copyright 2011 Freescale Semiconductor, Inc.
  * Copyright 2011 Linaro Ltd.
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/imx7-colibri.dts

@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2016 Toradex AG
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/meson-gxl-mali.dtsi

@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 BayLibre SAS
  * Author: Neil Armstrong <[email protected]>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 &apb {

arch/arm/dts/meson-gxl-s905x-khadas-vim.dts

@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 Martin Blumenstingl <[email protected]>.
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;

arch/arm/dts/meson-gxl-s905x-libretech-cc.dts

@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 BayLibre, SAS.
  * Author: Neil Armstrong <[email protected]>
  * Author: Jerome Brunet <[email protected]>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;

arch/arm/dts/meson-gxl-s905x-p212.dtsi

@@ -1,12 +1,11 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Martin Blumenstingl <[email protected]>.
  * Based on meson-gx-p23x-q20x.dtsi:
  * - Copyright (c) 2016 Endless Computers, Inc.
  *   Author: Carlo Caione <[email protected]>
  * - Copyright (c) 2016 BayLibre, SAS.
  *   Author: Neil Armstrong <[email protected]>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /* Common DTSI for devices which are based on the P212 reference board. */

arch/arm/dts/pcm052.dts

@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2016 Toradex AG
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/rk3188-radxarock.dts

@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (c) 2013 Heiko Stuebner <[email protected]>
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/rk3188.dtsi

@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (c) 2013 MundoReader S.L.
  * Author: Heiko Stuebner <[email protected]>
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 #include <dt-bindings/gpio/gpio.h>

arch/arm/dts/rk3229-evb.dts

@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Rockchip Electronics Co., Ltd.
- *
- * SPDX-License-Identifier:     GPL-2.0+ X11
  */
 
 /dts-v1/;