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: NFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: NTom Rini <trini@konsulko.com>

arch/arm/dts/bk4r1.dts

+// 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

+// 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

+// 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

+// 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

+// 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

+// 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

+// 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

+// 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

+// 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

+// 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

+// 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 <Mingkai.hu@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /include/ "fsl-ls1043a.dtsi"

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

+// 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 <Mingkai.hu@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1043a.dtsi

+// 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 <Mingkai.hu@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /include/ "skeleton64.dtsi"

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

+// 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

+// 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

+// 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 <Mingkai.hu@nxp.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /include/ "fsl-ls1046a.dtsi"

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

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Device Tree Include file for Freescale Layerscape-1046A family SoC.
  *
  * Copyright 2016, Freescale Semiconductor
  *
  * Mingkai Hu <Mingkai.hu@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/fsl-ls1046a.dtsi

+// 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 <mingkai.hu@nxp.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+	X11
  */
 
 /include/ "skeleton64.dtsi"

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

+// 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

+// 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

+// 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

+// 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

+// 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

+// 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

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * NXP LS2081A RDB board device tree source for QSPI-boot
  *
  * Author: Priyanka Jain <priyanka.jain@nxp.com>
  *
  * Copyright 2017 NXP
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

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

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * NXP ls2080a RDB board device tree source for QSPI-boot
  *
  * Author: Priyanka Jain <priyanka.jain@nxp.com>
  *
  * Copyright 2017 NXP
- *
- * SPDX-License-Identifier:	GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/imx53-cx9020.dts

+// 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

+// 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

+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 BayLibre SAS
  * Author: Neil Armstrong <narmstrong@baylibre.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 &apb {

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

+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 Martin Blumenstingl <martin.blumenstingl@googlemail.com>.
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;

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

+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2017 BayLibre, SAS.
  * Author: Neil Armstrong <narmstrong@baylibre.com>
  * Author: Jerome Brunet <jbrunet@baylibre.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;

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

+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (c) 2016 Martin Blumenstingl <martin.blumenstingl@googlemail.com>.
  * Based on meson-gx-p23x-q20x.dtsi:
@@ -5,8 +6,6 @@
  *   Author: Carlo Caione <carlo@endlessm.com>
  * - Copyright (c) 2016 BayLibre, SAS.
  *   Author: Neil Armstrong <narmstrong@baylibre.com>
- *
- * 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

+// 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

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (c) 2013 Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/rk3188.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (c) 2013 MundoReader S.L.
  * Author: Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 #include <dt-bindings/gpio/gpio.h>

arch/arm/dts/rk3229-evb.dts

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

arch/arm/dts/rk3288-evb.dts

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

arch/arm/dts/rk3288-evb.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier:     GPL-2.0+ X11
  */
 
 #include "rk3288.dtsi"

arch/arm/dts/rk3288-fennec.dts

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

arch/arm/dts/rk3288-firefly.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd@gmail.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+ X11
  */
 
 /dts-v1/;

arch/arm/dts/rk3288-firefly.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd@gmail.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+ X11
  */
 
 #include "rk3288.dtsi"

arch/arm/dts/rk3288-miqi.dts

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

arch/arm/dts/rk3288-miqi.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (c) 2016 Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier:     GPL-2.0+ X11
  */
 
 #include "rk3288.dtsi"

arch/arm/dts/rk3288-popmetal.dts

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

arch/arm/dts/rk3288-tinker.dts

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

arch/arm/dts/rk3368-geekbox-u-boot.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     GPL-2.0+	X11
  */
 
 &pinctrl {

arch/arm/dts/rk3368-lion-u-boot.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     GPL-2.0+	X11
  */
 
 / {

arch/arm/dts/rk3368-lion.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/rk3368-px5-evb-u-boot.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     GPL-2.0+	X11
  */
 
 &pinctrl {

arch/arm/dts/rk3368-sheep-u-boot.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     GPL-2.0+	X11
  */
 
 &pinctrl {

arch/arm/dts/rk3399-puma-ddr1333.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/rk3399-puma-ddr1600.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/rk3399-puma-ddr1866.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     GPL-2.0+	X11
  */
 
 /dts-v1/;

arch/arm/dts/rk3399-puma.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier:     GPL-2.0+	X11
  */
 
 #include <dt-bindings/pwm/pwm.h>

arch/arm/dts/rk3xxx.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (c) 2013 MundoReader S.L.
  * Author: Heiko Stuebner <heiko@sntech.de>
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>

arch/arm/dts/socfpga_arria10_socdk_sdmmc_handoff.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright (C) 2016-2017 Intel Corporation
  *
- * SPDX-License-Identifier:	GPL-2.0        X11
- *
  *<auto-generated>
  *	This code was generated by a tool based on
  *	handoffs from both Qsys and Quartus.

arch/arm/dts/stm32mp15-ddr.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright : STMicroelectronics 2018
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 / {

arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 /* STM32MP157C ED1 and ED2 BOARD configuration

arch/arm/dts/stm32mp157-u-boot.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright : STMicroelectronics 2018
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 / {

arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright : STMicroelectronics 2018
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #include <dt-bindings/clock/stm32mp1-clksrc.h>

arch/arm/dts/sun4i-a10-inet-3f.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
  *
  * Minimal dts file for the iNet 3F for u-boot only
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/sun4i-a10-inet-3w.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
  *
  * Minimal dts file for the iNet 3W for u-boot only
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/sun5i-a13-ampe-a76.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
  *
  * Minimal dts file for the Ampe A76 for u-boot only
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/sun5i-a13-inet-86vs.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
  *
  * Minimal dts file for the iNet 86VS for u-boot only
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/sun6i-a31-mixtile-loftq.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
  *
  * Minimal dts file for the Mixtile LOFT-Q for u-boot only
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/sun7i-a20-ainol-aw1.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
  *
  * Minimal dts file for the Ainol AW1 for u-boot only
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/sun7i-a20-m5.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
  *
  * Minimal dts file for the Mele M5 for u-boot only
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
  *
  * Minimal dts file for the Yones Toptech BD1078 for u-boot only
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts

+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Copyright (C) 2017 Chen-Yu Tsai <wens@csie.org>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;

arch/arm/dts/thunderx-88xx.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Cavium Thunder DTS file - Thunder board description
  *
  * Copyright (C) 2014, Cavium Inc.
  *
- * SPDX-License-Identifier:	GPL-2.0+ or X11
- *
  */
 
 /dts-v1/;

arch/arm/dts/thunderx-88xx.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Cavium Thunder DTS file - Thunder SoC description
  *
  * Copyright (C) 2014, Cavium Inc.
  *
- * SPDX-License-Identifier:	GPL-2.0+ or X11
- *
  */
 
 / {

arch/arm/dts/uniphier-pro5-4kbox.dts

+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
  * Device Tree Source for UniPhier Pro5 4KBOX Board (EVB-Pro5-4KBOX-M-V0)
  *
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 /dts-v1/;

arch/arm/dts/vf-colibri.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2014 Toradex AG
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 #include "vf.dtsi"
 

arch/arm/dts/vf.dtsi

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 /include/ "skeleton.dtsi"
 #include <dt-bindings/gpio/gpio.h>

arch/arm/dts/vf500-colibri.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2014 Toradex AG
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/vf610-colibri.dts

+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2014 Toradex AG
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;

arch/arm/dts/vf610-twr.dts

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

arch/arm/lib/crt0_aarch64_efi.S

+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */
 /*
  * crt0-efi-aarch64.S - PE/COFF header for aarch64 EFI applications
  *
  * Copright (C) 2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
  *
- * SPDX-License-Identifier:     GPL-2.0+     BSD-2-Clause
  *
  * This file is taken and modified from the gnu-efi project.
  */

arch/arm/lib/crt0_arm_efi.S

+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */
 /*
  * crt0-efi-arm.S - PE/COFF header for ARM EFI applications
  *
  * Copright (C) 2014 Linaro Ltd. <ard.biesheuvel@linaro.org>
  *
- * SPDX-License-Identifier:     GPL-2.0+     BSD-2-Clause
- *
  * This file is taken and modified from the gnu-efi project.
  */
 

arch/arm/mach-stm32mp/Makefile

+# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 #
 # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
 #
-# SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
-#
 
 obj-y += cpu.o
 obj-y += dram_init.o

arch/arm/mach-stm32mp/config.mk

+# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 #
 # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
 #
-# SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
-#
 
 ALL-$(CONFIG_SPL_BUILD) += spl/u-boot-spl.stm32
 

arch/arm/mach-stm32mp/cpu.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 #include <common.h>
 #include <clk.h>

arch/arm/mach-stm32mp/dram_init.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #include <common.h>

arch/arm/mach-stm32mp/include/mach/ddr.h

+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #ifndef __MACH_STM32MP_DDR_H_

arch/arm/mach-stm32mp/include/mach/stm32.h

+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #ifndef _MACH_STM32_H_

arch/arm/mach-stm32mp/include/mach/sys_proto.h

+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
 /*
  * Copyright (C) 2015-2017, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #define CPU_STMP32MP15x	0x500

arch/arm/mach-stm32mp/spl.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #include <common.h>

arch/arm/mach-stm32mp/syscon.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #include <common.h>

arch/x86/include/asm/sfi.h

+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
 /*
  * Copyright(c) 2009 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #ifndef _LINUX_SFI_H

board/Arcturus/ucp1020/cmd_arc.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Command for accessing Arcturus factory environment.
  *
@@ -5,8 +6,6 @@
  *           http://www.arcturusnetworks.com/products/ucp1020/
  *           by Oleksandr G Zhadan et al.
  *
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
- *
  */
 
 #include <common.h>

board/intel/edison/config.mk

+# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 #
 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Copyright (c) 2017 Intel Corporation
 #
-# SPDX-License-Identifier:	GPL-2.0	BSD-3-Clause
-#
 
 # Add 4096 bytes of zeroes to u-boot.bin
 quiet_cmd_mkalign_eds = EDSALGN $@

board/st/stm32mp1/Makefile

+# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 #
 # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
 #
-# SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
-#
 
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o

board/st/stm32mp1/README

+SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 #
 # Copyright (C) 2018 STMicroelectronics - All Rights Reserved
 #
-# SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
-#
 
 U-Boot on STMicroelectronics STM32MP1
 ======================================

board/st/stm32mp1/board.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #include <common.h>

board/st/stm32mp1/spl.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #include <config.h>

board/st/stm32mp1/stm32mp1.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 #include <config.h>
 #include <common.h>

board/theobroma-systems/lion_rk3368/fit_spl_atf.its

+/* SPDX-License-Identifier: GPL-2.0+ OR X11 */
 /*
  * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH
  *
  * Minimal dts for a SPL FIT image payload.
- *
- * SPDX-License-Identifier: GPL-2.0+  X11
  */
 
 /dts-v1/;

board/theobroma-systems/puma_rk3399/fit_spl_atf.its

+/* SPDX-License-Identifier: GPL-2.0+ OR X11 */
 /*
  * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH
  *
  * Minimal dts for a SPL FIT image payload.
- *
- * SPDX-License-Identifier: GPL-2.0+  X11
  */
 
 /dts-v1/;

common/spl/spl_ubi.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2016
  * Ladislav Michl <ladis@linux-mips.org>
- *
- * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
  */
 
 #include <common.h>

drivers/clk/clk_stm32mp1.c

+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
 /*
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- *
- * SPDX-License-Identifier:	GPL-2.0+	BSD-3-Clause
  */
 
 #include <common.h>