[U-Boot] [PATCH 2/2] SPDX: Convert all of our multiple license tags to Linux Kernel style
Tom Rini
trini at konsulko.com
Mon May 7 14:07:25 UTC 2018
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.
Signed-off-by: Tom Rini <trini at konsulko.com>
---
arch/arm/dts/bk4r1.dts | 3 +--
arch/arm/dts/fsl-ls1012a-frdm.dts | 3 +--
arch/arm/dts/fsl-ls1012a-frdm.dtsi | 3 +--
arch/arm/dts/fsl-ls1012a-qds.dts | 3 +--
arch/arm/dts/fsl-ls1012a-qds.dtsi | 3 +--
arch/arm/dts/fsl-ls1012a-rdb.dts | 3 +--
arch/arm/dts/fsl-ls1012a-rdb.dtsi | 3 +--
arch/arm/dts/fsl-ls1012a.dtsi | 3 +--
arch/arm/dts/fsl-ls1043a-qds-duart.dts | 3 +--
arch/arm/dts/fsl-ls1043a-qds-lpuart.dts | 3 +--
arch/arm/dts/fsl-ls1043a-qds.dtsi | 3 +--
arch/arm/dts/fsl-ls1043a-rdb.dts | 3 +--
arch/arm/dts/fsl-ls1043a.dtsi | 3 +--
arch/arm/dts/fsl-ls1046a-qds-duart.dts | 3 +--
arch/arm/dts/fsl-ls1046a-qds-lpuart.dts | 3 +--
arch/arm/dts/fsl-ls1046a-qds.dtsi | 3 +--
arch/arm/dts/fsl-ls1046a-rdb.dts | 3 +--
arch/arm/dts/fsl-ls1046a.dtsi | 3 +--
arch/arm/dts/fsl-ls1088a-qds.dts | 3 +--
arch/arm/dts/fsl-ls1088a-rdb.dts | 3 +--
arch/arm/dts/fsl-ls1088a.dtsi | 3 +--
arch/arm/dts/fsl-ls2080a-qds.dts | 3 +--
arch/arm/dts/fsl-ls2080a-rdb.dts | 3 +--
arch/arm/dts/fsl-ls2080a.dtsi | 3 +--
arch/arm/dts/fsl-ls2081a-rdb.dts | 3 +--
arch/arm/dts/fsl-ls2088a-rdb-qspi.dts | 3 +--
arch/arm/dts/imx53-cx9020.dts | 3 +--
arch/arm/dts/imx7-colibri.dts | 3 +--
arch/arm/dts/meson-gxl-mali.dtsi | 3 +--
arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 3 +--
arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 3 +--
arch/arm/dts/meson-gxl-s905x-p212.dtsi | 3 +--
arch/arm/dts/pcm052.dts | 3 +--
arch/arm/dts/rk3188-radxarock.dts | 3 +--
arch/arm/dts/rk3188.dtsi | 3 +--
arch/arm/dts/rk3229-evb.dts | 3 +--
arch/arm/dts/rk3288-evb.dts | 3 +--
arch/arm/dts/rk3288-evb.dtsi | 3 +--
arch/arm/dts/rk3288-fennec.dts | 3 +--
arch/arm/dts/rk3288-firefly.dts | 3 +--
arch/arm/dts/rk3288-firefly.dtsi | 3 +--
arch/arm/dts/rk3288-miqi.dts | 3 +--
arch/arm/dts/rk3288-miqi.dtsi | 3 +--
arch/arm/dts/rk3288-popmetal.dts | 3 +--
arch/arm/dts/rk3288-tinker.dts | 3 +--
arch/arm/dts/rk3368-geekbox-u-boot.dtsi | 3 +--
arch/arm/dts/rk3368-lion-u-boot.dtsi | 3 +--
arch/arm/dts/rk3368-lion.dts | 3 +--
arch/arm/dts/rk3368-px5-evb-u-boot.dtsi | 3 +--
arch/arm/dts/rk3368-sheep-u-boot.dtsi | 3 +--
arch/arm/dts/rk3399-puma-ddr1333.dts | 3 +--
arch/arm/dts/rk3399-puma-ddr1600.dts | 3 +--
arch/arm/dts/rk3399-puma-ddr1866.dts | 3 +--
arch/arm/dts/rk3399-puma.dtsi | 3 +--
arch/arm/dts/rk3xxx.dtsi | 3 +--
arch/arm/dts/socfpga_arria10_socdk_sdmmc_handoff.dtsi | 3 +--
arch/arm/dts/stm32mp15-ddr.dtsi | 3 +--
arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi | 3 +--
arch/arm/dts/stm32mp157-u-boot.dtsi | 3 +--
arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 3 +--
arch/arm/dts/sun4i-a10-inet-3f.dts | 3 +--
arch/arm/dts/sun4i-a10-inet-3w.dts | 3 +--
arch/arm/dts/sun5i-a13-ampe-a76.dts | 3 +--
arch/arm/dts/sun5i-a13-inet-86vs.dts | 3 +--
arch/arm/dts/sun6i-a31-mixtile-loftq.dts | 3 +--
arch/arm/dts/sun7i-a20-ainol-aw1.dts | 3 +--
arch/arm/dts/sun7i-a20-m5.dts | 3 +--
arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts | 3 +--
arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts | 3 +--
arch/arm/dts/thunderx-88xx.dts | 3 +--
arch/arm/dts/thunderx-88xx.dtsi | 3 +--
arch/arm/dts/uniphier-pro5-4kbox.dts | 3 +--
arch/arm/dts/vf-colibri.dtsi | 3 +--
arch/arm/dts/vf.dtsi | 3 +--
arch/arm/dts/vf500-colibri.dts | 3 +--
arch/arm/dts/vf610-colibri.dts | 3 +--
arch/arm/dts/vf610-twr.dts | 3 +--
arch/arm/lib/crt0_aarch64_efi.S | 2 +-
arch/arm/lib/crt0_arm_efi.S | 3 +--
arch/arm/mach-stm32mp/Makefile | 3 +--
arch/arm/mach-stm32mp/config.mk | 3 +--
arch/arm/mach-stm32mp/cpu.c | 3 +--
arch/arm/mach-stm32mp/dram_init.c | 3 +--
arch/arm/mach-stm32mp/include/mach/ddr.h | 3 +--
arch/arm/mach-stm32mp/include/mach/stm32.h | 3 +--
arch/arm/mach-stm32mp/include/mach/sys_proto.h | 3 +--
arch/arm/mach-stm32mp/spl.c | 3 +--
arch/arm/mach-stm32mp/syscon.c | 3 +--
arch/x86/include/asm/sfi.h | 3 +--
board/Arcturus/ucp1020/cmd_arc.c | 3 +--
board/intel/edison/config.mk | 3 +--
board/st/stm32mp1/Makefile | 3 +--
board/st/stm32mp1/README | 3 +--
board/st/stm32mp1/board.c | 3 +--
board/st/stm32mp1/spl.c | 3 +--
board/st/stm32mp1/stm32mp1.c | 3 +--
board/theobroma-systems/lion_rk3368/fit_spl_atf.its | 3 +--
board/theobroma-systems/puma_rk3399/fit_spl_atf.its | 3 +--
common/spl/spl_ubi.c | 3 +--
drivers/clk/clk_stm32mp1.c | 3 +--
drivers/mtd/ubispl/ubi-wrapper.h | 3 +--
drivers/mtd/ubispl/ubispl.c | 3 +--
drivers/mtd/ubispl/ubispl.h | 3 +--
drivers/power/pmic/stpmu1.c | 3 +--
drivers/ram/stm32mp1/Makefile | 3 +--
drivers/ram/stm32mp1/stm32mp1_ddr.c | 3 +--
drivers/ram/stm32mp1/stm32mp1_ddr.h | 3 +--
drivers/ram/stm32mp1/stm32mp1_ddr_regs.h | 3 +--
drivers/ram/stm32mp1/stm32mp1_ram.c | 3 +--
drivers/usb/gadget/f_mass_storage.c | 3 +--
include/api_public.h | 3 +--
include/configs/stm32mp1.h | 3 +--
include/miiphy.h | 3 +--
include/power/stpmu1.h | 3 +--
include/ubispl.h | 3 +--
lib/libfdt/fdt_region.c | 2 +-
lib/libfdt/fdt_ro.c | 2 +-
lib/lz4_wrapper.c | 3 +--
scripts/dtc/pylibfdt/libfdt.i_shipped | 3 +--
tools/relocate-rela.c | 3 +--
tools/stm32image.c | 3 +--
121 files changed, 121 insertions(+), 239 deletions(-)
diff --git a/arch/arm/dts/bk4r1.dts b/arch/arm/dts/bk4r1.dts
index 197e5abd704f..866b80e0b0b3 100644
--- a/arch/arm/dts/bk4r1.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1012a-frdm.dts b/arch/arm/dts/fsl-ls1012a-frdm.dts
index 6ea5f82ec428..a7e30017f1db 100644
--- a/arch/arm/dts/fsl-ls1012a-frdm.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1012a-frdm.dtsi b/arch/arm/dts/fsl-ls1012a-frdm.dtsi
index d453f5daca8b..9cb3de1d40cf 100644
--- a/arch/arm/dts/fsl-ls1012a-frdm.dtsi
+++ b/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"
diff --git a/arch/arm/dts/fsl-ls1012a-qds.dts b/arch/arm/dts/fsl-ls1012a-qds.dts
index ccc9023e39fe..0b0149ba104a 100644
--- a/arch/arm/dts/fsl-ls1012a-qds.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1012a-qds.dtsi b/arch/arm/dts/fsl-ls1012a-qds.dtsi
index 908fbedf03d2..d069b603abd3 100644
--- a/arch/arm/dts/fsl-ls1012a-qds.dtsi
+++ b/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"
diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dts b/arch/arm/dts/fsl-ls1012a-rdb.dts
index 400cd9e7e8e1..8d0d559e53b8 100644
--- a/arch/arm/dts/fsl-ls1012a-rdb.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dtsi b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
index c4b6adffb8d5..201e5faead14 100644
--- a/arch/arm/dts/fsl-ls1012a-rdb.dtsi
+++ b/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"
diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi
index 215e095c3249..be9907655061 100644
--- a/arch/arm/dts/fsl-ls1012a.dtsi
+++ b/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"
diff --git a/arch/arm/dts/fsl-ls1043a-qds-duart.dts b/arch/arm/dts/fsl-ls1043a-qds-duart.dts
index cf53ab0025df..f2a9a1d2cdea 100644
--- a/arch/arm/dts/fsl-ls1043a-qds-duart.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1043a-qds-lpuart.dts b/arch/arm/dts/fsl-ls1043a-qds-lpuart.dts
index 118c45deef4b..a9fc931930a1 100644
--- a/arch/arm/dts/fsl-ls1043a-qds-lpuart.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi
index 9611619b59ae..addb9abfb932 100644
--- a/arch/arm/dts/fsl-ls1043a-qds.dtsi
+++ b/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 <Mingkai.hu at freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "fsl-ls1043a.dtsi"
diff --git a/arch/arm/dts/fsl-ls1043a-rdb.dts b/arch/arm/dts/fsl-ls1043a-rdb.dts
index 27670a862933..c42cad703484 100644
--- a/arch/arm/dts/fsl-ls1043a-rdb.dts
+++ b/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 <Mingkai.hu at freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi
index 3cc20774c12a..ff401222ff28 100644
--- a/arch/arm/dts/fsl-ls1043a.dtsi
+++ b/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 <Mingkai.hu at freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "skeleton64.dtsi"
diff --git a/arch/arm/dts/fsl-ls1046a-qds-duart.dts b/arch/arm/dts/fsl-ls1046a-qds-duart.dts
index 9a4b84fedbb6..94f0c674faae 100644
--- a/arch/arm/dts/fsl-ls1046a-qds-duart.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1046a-qds-lpuart.dts b/arch/arm/dts/fsl-ls1046a-qds-lpuart.dts
index 1c4d36265679..607ecc6767fc 100644
--- a/arch/arm/dts/fsl-ls1046a-qds-lpuart.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi
index 4e1920be8726..ba36853b1bec 100644
--- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
+++ b/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 <Mingkai.hu at nxp.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "fsl-ls1046a.dtsi"
diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index 646e4772c1cd..136de245f3d4 100644
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/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 <Mingkai.hu at freescale.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi
index f46707d32011..4acbaf78e80b 100644
--- a/arch/arm/dts/fsl-ls1046a.dtsi
+++ b/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 <mingkai.hu at nxp.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/include/ "skeleton64.dtsi"
diff --git a/arch/arm/dts/fsl-ls1088a-qds.dts b/arch/arm/dts/fsl-ls1088a-qds.dts
index 02000fcba820..36116f7944c0 100644
--- a/arch/arm/dts/fsl-ls1088a-qds.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1088a-rdb.dts b/arch/arm/dts/fsl-ls1088a-rdb.dts
index 7b6ca1d49ecc..0be3f8d025e1 100644
--- a/arch/arm/dts/fsl-ls1088a-rdb.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index b4a42cf5d0cd..077caf3cc21a 100644
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/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
*/
/ {
diff --git a/arch/arm/dts/fsl-ls2080a-qds.dts b/arch/arm/dts/fsl-ls2080a-qds.dts
index b85b802ee617..fbd6c78e9fdd 100644
--- a/arch/arm/dts/fsl-ls2080a-qds.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls2080a-rdb.dts b/arch/arm/dts/fsl-ls2080a-rdb.dts
index 04b1a71016b1..541bcd37a025 100644
--- a/arch/arm/dts/fsl-ls2080a-rdb.dts
+++ b/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/;
diff --git a/arch/arm/dts/fsl-ls2080a.dtsi b/arch/arm/dts/fsl-ls2080a.dtsi
index 69273a983653..b0f85170b0c0 100644
--- a/arch/arm/dts/fsl-ls2080a.dtsi
+++ b/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
*/
/ {
diff --git a/arch/arm/dts/fsl-ls2081a-rdb.dts b/arch/arm/dts/fsl-ls2081a-rdb.dts
index ef668a3432a8..73e2683d59bc 100644
--- a/arch/arm/dts/fsl-ls2081a-rdb.dts
+++ b/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 <priyanka.jain at nxp.com>
*
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
index 9e3875d8c019..c8bf9a01fe01 100644
--- a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
+++ b/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 <priyanka.jain at nxp.com>
*
* Copyright 2017 NXP
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/imx53-cx9020.dts b/arch/arm/dts/imx53-cx9020.dts
index c928e727d5f2..c2e7d86c1b88 100644
--- a/arch/arm/dts/imx53-cx9020.dts
+++ b/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/;
diff --git a/arch/arm/dts/imx7-colibri.dts b/arch/arm/dts/imx7-colibri.dts
index f6c21052ae84..a2cade762a1e 100644
--- a/arch/arm/dts/imx7-colibri.dts
+++ b/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/;
diff --git a/arch/arm/dts/meson-gxl-mali.dtsi b/arch/arm/dts/meson-gxl-mali.dtsi
index f06cc234693b..f825506cdf64 100644
--- a/arch/arm/dts/meson-gxl-mali.dtsi
+++ b/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 <narmstrong at baylibre.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
*/
&apb {
diff --git a/arch/arm/dts/meson-gxl-s905x-khadas-vim.dts b/arch/arm/dts/meson-gxl-s905x-khadas-vim.dts
index 94567eb17875..84cbebb53407 100644
--- a/arch/arm/dts/meson-gxl-s905x-khadas-vim.dts
+++ b/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 <martin.blumenstingl at googlemail.com>.
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
*/
/dts-v1/;
diff --git a/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts b/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts
index 266fbcf3e47f..dc2acf4d16f4 100644
--- a/arch/arm/dts/meson-gxl-s905x-libretech-cc.dts
+++ b/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 <narmstrong at baylibre.com>
* Author: Jerome Brunet <jbrunet at baylibre.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
*/
/dts-v1/;
diff --git a/arch/arm/dts/meson-gxl-s905x-p212.dtsi b/arch/arm/dts/meson-gxl-s905x-p212.dtsi
index f3eea8e89d12..0385fb986148 100644
--- a/arch/arm/dts/meson-gxl-s905x-p212.dtsi
+++ b/arch/arm/dts/meson-gxl-s905x-p212.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2016 Martin Blumenstingl <martin.blumenstingl at googlemail.com>.
* Based on meson-gx-p23x-q20x.dtsi:
@@ -5,8 +6,6 @@
* Author: Carlo Caione <carlo at endlessm.com>
* - Copyright (c) 2016 BayLibre, SAS.
* Author: Neil Armstrong <narmstrong at baylibre.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
*/
/* Common DTSI for devices which are based on the P212 reference board. */
diff --git a/arch/arm/dts/pcm052.dts b/arch/arm/dts/pcm052.dts
index 0985587fc7bf..6489fdc6f412 100644
--- a/arch/arm/dts/pcm052.dts
+++ b/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/;
diff --git a/arch/arm/dts/rk3188-radxarock.dts b/arch/arm/dts/rk3188-radxarock.dts
index 0fc4f54af2d4..ac931e14af19 100644
--- a/arch/arm/dts/rk3188-radxarock.dts
+++ b/arch/arm/dts/rk3188-radxarock.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright (c) 2013 Heiko Stuebner <heiko at sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/rk3188.dtsi b/arch/arm/dts/rk3188.dtsi
index aeb5b80e144a..7bcca6a02d69 100644
--- a/arch/arm/dts/rk3188.dtsi
+++ b/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 <heiko at sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/dts/rk3229-evb.dts b/arch/arm/dts/rk3229-evb.dts
index ae0b0a4b8e3f..bfb367ac99f0 100644
--- a/arch/arm/dts/rk3229-evb.dts
+++ b/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/;
diff --git a/arch/arm/dts/rk3288-evb.dts b/arch/arm/dts/rk3288-evb.dts
index 3f03e1326cb3..575de44c05db 100644
--- a/arch/arm/dts/rk3288-evb.dts
+++ b/arch/arm/dts/rk3288-evb.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/rk3288-evb.dtsi b/arch/arm/dts/rk3288-evb.dtsi
index a84156fe1468..17c79d3c279c 100644
--- a/arch/arm/dts/rk3288-evb.dtsi
+++ b/arch/arm/dts/rk3288-evb.dtsi
@@ -1,7 +1,6 @@
+// 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"
diff --git a/arch/arm/dts/rk3288-fennec.dts b/arch/arm/dts/rk3288-fennec.dts
index 66ddf8d655be..b56930716802 100644
--- a/arch/arm/dts/rk3288-fennec.dts
+++ b/arch/arm/dts/rk3288-fennec.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/rk3288-firefly.dts b/arch/arm/dts/rk3288-firefly.dts
index 59ff8bc10440..2e075406f40c 100644
--- a/arch/arm/dts/rk3288-firefly.dts
+++ b/arch/arm/dts/rk3288-firefly.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd at gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/rk3288-firefly.dtsi b/arch/arm/dts/rk3288-firefly.dtsi
index 072eaa61168a..de5e8f2e8d1a 100644
--- a/arch/arm/dts/rk3288-firefly.dtsi
+++ b/arch/arm/dts/rk3288-firefly.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd at gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
#include "rk3288.dtsi"
diff --git a/arch/arm/dts/rk3288-miqi.dts b/arch/arm/dts/rk3288-miqi.dts
index 7b92caf024f7..29e60dd125e8 100644
--- a/arch/arm/dts/rk3288-miqi.dts
+++ b/arch/arm/dts/rk3288-miqi.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/rk3288-miqi.dtsi b/arch/arm/dts/rk3288-miqi.dtsi
index 47dc0f9d74d5..432f744bebc2 100644
--- a/arch/arm/dts/rk3288-miqi.dtsi
+++ b/arch/arm/dts/rk3288-miqi.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright (c) 2016 Heiko Stuebner <heiko at sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
#include "rk3288.dtsi"
diff --git a/arch/arm/dts/rk3288-popmetal.dts b/arch/arm/dts/rk3288-popmetal.dts
index 284d5eda7bc6..d1e1cd51125a 100644
--- a/arch/arm/dts/rk3288-popmetal.dts
+++ b/arch/arm/dts/rk3288-popmetal.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
index ea2f7159220c..3edd21cc2f4b 100644
--- a/arch/arm/dts/rk3288-tinker.dts
+++ b/arch/arm/dts/rk3288-tinker.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* (C) Copyright 2016 Rockchip Electronics Co., Ltd
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/rk3368-geekbox-u-boot.dtsi b/arch/arm/dts/rk3368-geekbox-u-boot.dtsi
index 764b3e4cb4fb..30ea9e433ae9 100644
--- a/arch/arm/dts/rk3368-geekbox-u-boot.dtsi
+++ b/arch/arm/dts/rk3368-geekbox-u-boot.dtsi
@@ -1,7 +1,6 @@
+// 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 {
diff --git a/arch/arm/dts/rk3368-lion-u-boot.dtsi b/arch/arm/dts/rk3368-lion-u-boot.dtsi
index a9b7f81c6273..fb4a4fb59ca1 100644
--- a/arch/arm/dts/rk3368-lion-u-boot.dtsi
+++ b/arch/arm/dts/rk3368-lion-u-boot.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+ X11
*/
/ {
diff --git a/arch/arm/dts/rk3368-lion.dts b/arch/arm/dts/rk3368-lion.dts
index f018b8b14636..5e578b175b5e 100644
--- a/arch/arm/dts/rk3368-lion.dts
+++ b/arch/arm/dts/rk3368-lion.dts
@@ -1,7 +1,6 @@
+// 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/;
diff --git a/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi b/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi
index 3a5e30ea5512..749578145487 100644
--- a/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3368-px5-evb-u-boot.dtsi
@@ -1,7 +1,6 @@
+// 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 {
diff --git a/arch/arm/dts/rk3368-sheep-u-boot.dtsi b/arch/arm/dts/rk3368-sheep-u-boot.dtsi
index 764b3e4cb4fb..30ea9e433ae9 100644
--- a/arch/arm/dts/rk3368-sheep-u-boot.dtsi
+++ b/arch/arm/dts/rk3368-sheep-u-boot.dtsi
@@ -1,7 +1,6 @@
+// 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 {
diff --git a/arch/arm/dts/rk3399-puma-ddr1333.dts b/arch/arm/dts/rk3399-puma-ddr1333.dts
index 564de912264d..8f1193cbe688 100644
--- a/arch/arm/dts/rk3399-puma-ddr1333.dts
+++ b/arch/arm/dts/rk3399-puma-ddr1333.dts
@@ -1,7 +1,6 @@
+// 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/;
diff --git a/arch/arm/dts/rk3399-puma-ddr1600.dts b/arch/arm/dts/rk3399-puma-ddr1600.dts
index 31aaf7046464..337e0eabb485 100644
--- a/arch/arm/dts/rk3399-puma-ddr1600.dts
+++ b/arch/arm/dts/rk3399-puma-ddr1600.dts
@@ -1,7 +1,6 @@
+// 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/;
diff --git a/arch/arm/dts/rk3399-puma-ddr1866.dts b/arch/arm/dts/rk3399-puma-ddr1866.dts
index 4eec8e761193..bb86a448fae5 100644
--- a/arch/arm/dts/rk3399-puma-ddr1866.dts
+++ b/arch/arm/dts/rk3399-puma-ddr1866.dts
@@ -1,7 +1,6 @@
+// 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/;
diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index d2c961e31784..35840319ff04 100644
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -1,7 +1,6 @@
+// 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>
diff --git a/arch/arm/dts/rk3xxx.dtsi b/arch/arm/dts/rk3xxx.dtsi
index 6d9e36d235c1..612ed44bd6a8 100644
--- a/arch/arm/dts/rk3xxx.dtsi
+++ b/arch/arm/dts/rk3xxx.dtsi
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright (c) 2013 MundoReader S.L.
* Author: Heiko Stuebner <heiko at sntech.de>
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
#include <dt-bindings/interrupt-controller/irq.h>
diff --git a/arch/arm/dts/socfpga_arria10_socdk_sdmmc_handoff.dtsi b/arch/arm/dts/socfpga_arria10_socdk_sdmmc_handoff.dtsi
index d10e0899766a..b6939b011aa1 100644
--- a/arch/arm/dts/socfpga_arria10_socdk_sdmmc_handoff.dtsi
+++ b/arch/arm/dts/socfpga_arria10_socdk_sdmmc_handoff.dtsi
@@ -1,8 +1,7 @@
+// 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.
diff --git a/arch/arm/dts/stm32mp15-ddr.dtsi b/arch/arm/dts/stm32mp15-ddr.dtsi
index ddfa0794d9f8..094f8424b42e 100644
--- a/arch/arm/dts/stm32mp15-ddr.dtsi
+++ b/arch/arm/dts/stm32mp15-ddr.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
/*
* Copyright : STMicroelectronics 2018
- *
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
*/
/ {
diff --git a/arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi b/arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi
index 352e470fa9d8..8a5a821ec4e2 100644
--- a/arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi
+++ b/arch/arm/dts/stm32mp15-ddr3-2x4Gb-1066-binG.dtsi
@@ -1,7 +1,6 @@
+// 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
diff --git a/arch/arm/dts/stm32mp157-u-boot.dtsi b/arch/arm/dts/stm32mp157-u-boot.dtsi
index 1eca8020f966..fa9fd29bddf8 100644
--- a/arch/arm/dts/stm32mp157-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157-u-boot.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
/*
* Copyright : STMicroelectronics 2018
- *
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
*/
/ {
diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
index 2caa939760d5..5b8be93512b5 100644
--- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
@@ -1,7 +1,6 @@
+// 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>
diff --git a/arch/arm/dts/sun4i-a10-inet-3f.dts b/arch/arm/dts/sun4i-a10-inet-3f.dts
index d2805c5415f3..f815b8315780 100644
--- a/arch/arm/dts/sun4i-a10-inet-3f.dts
+++ b/arch/arm/dts/sun4i-a10-inet-3f.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2015 Hans de Goede <hdegoede at redhat.com>
*
* Minimal dts file for the iNet 3F for u-boot only
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/sun4i-a10-inet-3w.dts b/arch/arm/dts/sun4i-a10-inet-3w.dts
index 96fa826371b6..d0267ceee908 100644
--- a/arch/arm/dts/sun4i-a10-inet-3w.dts
+++ b/arch/arm/dts/sun4i-a10-inet-3w.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2015 Hans de Goede <hdegoede at redhat.com>
*
* Minimal dts file for the iNet 3W for u-boot only
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/sun5i-a13-ampe-a76.dts b/arch/arm/dts/sun5i-a13-ampe-a76.dts
index f216f27760a8..1bf88816c3d7 100644
--- a/arch/arm/dts/sun5i-a13-ampe-a76.dts
+++ b/arch/arm/dts/sun5i-a13-ampe-a76.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2015 Hans de Goede <hdegoede at redhat.com>
*
* Minimal dts file for the Ampe A76 for u-boot only
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/sun5i-a13-inet-86vs.dts b/arch/arm/dts/sun5i-a13-inet-86vs.dts
index d073294e9613..aef733b3fe9b 100644
--- a/arch/arm/dts/sun5i-a13-inet-86vs.dts
+++ b/arch/arm/dts/sun5i-a13-inet-86vs.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2015 Hans de Goede <hdegoede at redhat.com>
*
* Minimal dts file for the iNet 86VS for u-boot only
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/sun6i-a31-mixtile-loftq.dts b/arch/arm/dts/sun6i-a31-mixtile-loftq.dts
index 658ffce0fb51..32ab9751c6e8 100644
--- a/arch/arm/dts/sun6i-a31-mixtile-loftq.dts
+++ b/arch/arm/dts/sun6i-a31-mixtile-loftq.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2015 Hans de Goede <hdegoede at redhat.com>
*
* Minimal dts file for the Mixtile LOFT-Q for u-boot only
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/sun7i-a20-ainol-aw1.dts b/arch/arm/dts/sun7i-a20-ainol-aw1.dts
index 8b730cdfaef0..57fe0066cb4f 100644
--- a/arch/arm/dts/sun7i-a20-ainol-aw1.dts
+++ b/arch/arm/dts/sun7i-a20-ainol-aw1.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2015 Hans de Goede <hdegoede at redhat.com>
*
* Minimal dts file for the Ainol AW1 for u-boot only
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/sun7i-a20-m5.dts b/arch/arm/dts/sun7i-a20-m5.dts
index c4aed8c79c3e..00c3ffd32388 100644
--- a/arch/arm/dts/sun7i-a20-m5.dts
+++ b/arch/arm/dts/sun7i-a20-m5.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2015 Hans de Goede <hdegoede at redhat.com>
*
* Minimal dts file for the Mele M5 for u-boot only
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts b/arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts
index 759ec9d93ba7..f1fb97d3fb51 100644
--- a/arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts
+++ b/arch/arm/dts/sun7i-a20-yones-toptech-bd1078.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2015 Hans de Goede <hdegoede at redhat.com>
*
* Minimal dts file for the Yones Toptech BD1078 for u-boot only
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts b/arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts
index c8fd69f0a4b8..1fcb16c7eb9a 100644
--- a/arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts
+++ b/arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (C) 2017 Chen-Yu Tsai <wens at csie.org>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
*/
/dts-v1/;
diff --git a/arch/arm/dts/thunderx-88xx.dts b/arch/arm/dts/thunderx-88xx.dts
index 08f267879f9d..22d8f7efb2d6 100644
--- a/arch/arm/dts/thunderx-88xx.dts
+++ b/arch/arm/dts/thunderx-88xx.dts
@@ -1,10 +1,9 @@
+// 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/;
diff --git a/arch/arm/dts/thunderx-88xx.dtsi b/arch/arm/dts/thunderx-88xx.dtsi
index 6e9230b03523..b8d6f7b315f3 100644
--- a/arch/arm/dts/thunderx-88xx.dtsi
+++ b/arch/arm/dts/thunderx-88xx.dtsi
@@ -1,10 +1,9 @@
+// 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
- *
*/
/ {
diff --git a/arch/arm/dts/uniphier-pro5-4kbox.dts b/arch/arm/dts/uniphier-pro5-4kbox.dts
index 1986a0be4b6d..b57acc90ceeb 100644
--- a/arch/arm/dts/uniphier-pro5-4kbox.dts
+++ b/arch/arm/dts/uniphier-pro5-4kbox.dts
@@ -1,10 +1,9 @@
+// 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 at socionext.com>
- *
- * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
*/
/dts-v1/;
diff --git a/arch/arm/dts/vf-colibri.dtsi b/arch/arm/dts/vf-colibri.dtsi
index c2f104a89b4e..923dc2451cd2 100644
--- a/arch/arm/dts/vf-colibri.dtsi
+++ b/arch/arm/dts/vf-colibri.dtsi
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2014 Toradex AG
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
#include "vf.dtsi"
diff --git a/arch/arm/dts/vf.dtsi b/arch/arm/dts/vf.dtsi
index 477d8de2d49b..5198eee02419 100644
--- a/arch/arm/dts/vf.dtsi
+++ b/arch/arm/dts/vf.dtsi
@@ -1,7 +1,6 @@
+// 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>
diff --git a/arch/arm/dts/vf500-colibri.dts b/arch/arm/dts/vf500-colibri.dts
index 02d0ce8653ec..3f33d970e0ee 100644
--- a/arch/arm/dts/vf500-colibri.dts
+++ b/arch/arm/dts/vf500-colibri.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2014 Toradex AG
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/vf610-colibri.dts b/arch/arm/dts/vf610-colibri.dts
index 24dfcbe0fc3a..0a6b937feea6 100644
--- a/arch/arm/dts/vf610-colibri.dts
+++ b/arch/arm/dts/vf610-colibri.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Copyright 2014 Toradex AG
- *
- * SPDX-License-Identifier: GPL-2.0+ or X11
*/
/dts-v1/;
diff --git a/arch/arm/dts/vf610-twr.dts b/arch/arm/dts/vf610-twr.dts
index 237aa8d7fa54..62e9f438b027 100644
--- a/arch/arm/dts/vf610-twr.dts
+++ b/arch/arm/dts/vf610-twr.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/;
diff --git a/arch/arm/lib/crt0_aarch64_efi.S b/arch/arm/lib/crt0_aarch64_efi.S
index 9b0e894f8a2e..5b6c3849f755 100644
--- a/arch/arm/lib/crt0_aarch64_efi.S
+++ b/arch/arm/lib/crt0_aarch64_efi.S
@@ -1,9 +1,9 @@
+/* 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 at linaro.org>
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
*
* This file is taken and modified from the gnu-efi project.
*/
diff --git a/arch/arm/lib/crt0_arm_efi.S b/arch/arm/lib/crt0_arm_efi.S
index af55bba4baa0..0f296f3be4b5 100644
--- a/arch/arm/lib/crt0_arm_efi.S
+++ b/arch/arm/lib/crt0_arm_efi.S
@@ -1,10 +1,9 @@
+/* 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 at linaro.org>
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
- *
* This file is taken and modified from the gnu-efi project.
*/
diff --git a/arch/arm/mach-stm32mp/Makefile b/arch/arm/mach-stm32mp/Makefile
index a495c53be8ca..cdb087c31fe6 100644
--- a/arch/arm/mach-stm32mp/Makefile
+++ b/arch/arm/mach-stm32mp/Makefile
@@ -1,8 +1,7 @@
+# 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
diff --git a/arch/arm/mach-stm32mp/config.mk b/arch/arm/mach-stm32mp/config.mk
index 34e59c61ac08..cde5850e9343 100644
--- a/arch/arm/mach-stm32mp/config.mk
+++ b/arch/arm/mach-stm32mp/config.mk
@@ -1,8 +1,7 @@
+# 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
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index f9f3bf9050ec..dfcbbd231463 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index ecb4c988d201..7688b3e315e3 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/arch/arm/mach-stm32mp/include/mach/ddr.h b/arch/arm/mach-stm32mp/include/mach/ddr.h
index b635001df8e2..18575842ba9a 100644
--- a/arch/arm/mach-stm32mp/include/mach/ddr.h
+++ b/arch/arm/mach-stm32mp/include/mach/ddr.h
@@ -1,7 +1,6 @@
+/* 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_
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32.h b/arch/arm/mach-stm32mp/include/mach/stm32.h
index c7a27894c451..20904026323a 100644
--- a/arch/arm/mach-stm32mp/include/mach/stm32.h
+++ b/arch/arm/mach-stm32mp/include/mach/stm32.h
@@ -1,7 +1,6 @@
+/* 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_
diff --git a/arch/arm/mach-stm32mp/include/mach/sys_proto.h b/arch/arm/mach-stm32mp/include/mach/sys_proto.h
index a8c20d1b2a44..41d4b40bcb4f 100644
--- a/arch/arm/mach-stm32mp/include/mach/sys_proto.h
+++ b/arch/arm/mach-stm32mp/include/mach/sys_proto.h
@@ -1,7 +1,6 @@
+/* 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
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index bfb3e50f67c2..b56f0c5381c3 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/arch/arm/mach-stm32mp/syscon.c b/arch/arm/mach-stm32mp/syscon.c
index 56417459311f..66b94f592f79 100644
--- a/arch/arm/mach-stm32mp/syscon.c
+++ b/arch/arm/mach-stm32mp/syscon.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/arch/x86/include/asm/sfi.h b/arch/x86/include/asm/sfi.h
index 6c6ebeade8c9..09d470081200 100644
--- a/arch/x86/include/asm/sfi.h
+++ b/arch/x86/include/asm/sfi.h
@@ -1,7 +1,6 @@
+/* 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
diff --git a/board/Arcturus/ucp1020/cmd_arc.c b/board/Arcturus/ucp1020/cmd_arc.c
index 0d3ac88fffea..1c42fee3d6a1 100644
--- a/board/Arcturus/ucp1020/cmd_arc.c
+++ b/board/Arcturus/ucp1020/cmd_arc.c
@@ -1,3 +1,4 @@
+// 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>
diff --git a/board/intel/edison/config.mk b/board/intel/edison/config.mk
index 465133fd7705..fdcbbdf3b1af 100644
--- a/board/intel/edison/config.mk
+++ b/board/intel/edison/config.mk
@@ -1,9 +1,8 @@
+# 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 $@
diff --git a/board/st/stm32mp1/Makefile b/board/st/stm32mp1/Makefile
index eaf45b778713..8188075b1a39 100644
--- a/board/st/stm32mp1/Makefile
+++ b/board/st/stm32mp1/Makefile
@@ -1,8 +1,7 @@
+# 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
diff --git a/board/st/stm32mp1/README b/board/st/stm32mp1/README
index 42a39d013e50..7d7ad8bd2a8f 100644
--- a/board/st/stm32mp1/README
+++ b/board/st/stm32mp1/README
@@ -1,8 +1,7 @@
+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
======================================
diff --git a/board/st/stm32mp1/board.c b/board/st/stm32mp1/board.c
index 03f900a36599..956768f04479 100644
--- a/board/st/stm32mp1/board.c
+++ b/board/st/stm32mp1/board.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/board/st/stm32mp1/spl.c b/board/st/stm32mp1/spl.c
index b7e5f247e7c6..f3db0d638539 100644
--- a/board/st/stm32mp1/spl.c
+++ b/board/st/stm32mp1/spl.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index 84c971c7933d..cc39fa6df9c3 100644
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/board/theobroma-systems/lion_rk3368/fit_spl_atf.its b/board/theobroma-systems/lion_rk3368/fit_spl_atf.its
index e3bea5ea2fe7..6b04fbc7da69 100644
--- a/board/theobroma-systems/lion_rk3368/fit_spl_atf.its
+++ b/board/theobroma-systems/lion_rk3368/fit_spl_atf.its
@@ -1,9 +1,8 @@
+/* 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/;
diff --git a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its b/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
index cb7d92fead69..530f059f3da5 100644
--- a/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
+++ b/board/theobroma-systems/puma_rk3399/fit_spl_atf.its
@@ -1,9 +1,8 @@
+/* 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/;
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index 83089335a788..a7939e90305f 100644
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
/*
* Copyright (C) 2016
* Ladislav Michl <ladis at linux-mips.org>
- *
- * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
*/
#include <common.h>
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index c67aa444735a..ed32585eb021 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/drivers/mtd/ubispl/ubi-wrapper.h b/drivers/mtd/ubispl/ubi-wrapper.h
index 72b9dcb76d9e..b58f42dd1a59 100644
--- a/drivers/mtd/ubispl/ubi-wrapper.h
+++ b/drivers/mtd/ubispl/ubi-wrapper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL 2.0+ OR BSD-3-Clause */
/*
* The parts taken from the kernel implementation are:
*
@@ -6,8 +7,6 @@
* UBISPL specific defines:
*
* Copyright (c) Thomas Gleixner <tglx at linutronix.de>
- *
- * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
*/
/*
diff --git a/drivers/mtd/ubispl/ubispl.c b/drivers/mtd/ubispl/ubispl.c
index a81a8e715da1..eeb1cbefb757 100644
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
/*
* Copyright (c) Thomas Gleixner <tglx at linutronix.de>
*
* The parts taken from the kernel implementation are:
*
* Copyright (c) International Business Machines Corp., 2006
- *
- * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
*/
#include <common.h>
diff --git a/drivers/mtd/ubispl/ubispl.h b/drivers/mtd/ubispl/ubispl.h
index 9227881f63ea..9e40b46eac39 100644
--- a/drivers/mtd/ubispl/ubispl.h
+++ b/drivers/mtd/ubispl/ubispl.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL 2.0+ OR BSD-3-Clause */
/*
* Copyright (c) Thomas Gleixner <tglx at linutronix.de>
- *
- * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
*/
#ifndef _UBOOT_MTD_UBISPL_H
diff --git a/drivers/power/pmic/stpmu1.c b/drivers/power/pmic/stpmu1.c
index 4615365ea809..a765c4f2e9ca 100644
--- a/drivers/power/pmic/stpmu1.c
+++ b/drivers/power/pmic/stpmu1.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/drivers/ram/stm32mp1/Makefile b/drivers/ram/stm32mp1/Makefile
index 9f05cd4b2144..79eb028fab6c 100644
--- a/drivers/ram/stm32mp1/Makefile
+++ b/drivers/ram/stm32mp1/Makefile
@@ -1,8 +1,7 @@
+# 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 += stm32mp1_ram.o
obj-y += stm32mp1_ddr.o
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.c b/drivers/ram/stm32mp1/stm32mp1_ddr.c
index ffe50d9cc2e7..c7c3ba70a4ec 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr.h b/drivers/ram/stm32mp1/stm32mp1_ddr.h
index b77d823868bc..3cd0161299eb 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr.h
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr.h
@@ -1,7 +1,6 @@
+/* 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 _RAM_STM32MP1_DDR_H
diff --git a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h
index 82c254b50d63..a606b2bcbe27 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h
+++ b/drivers/ram/stm32mp1/stm32mp1_ddr_regs.h
@@ -1,7 +1,6 @@
+/* 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 _RAM_STM32MP1_DDR_REGS_H
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c
index 4dc84d0e2917..a40f992f1a7a 100644
--- a/drivers/ram/stm32mp1/stm32mp1_ram.c
+++ b/drivers/ram/stm32mp1/stm32mp1_ram.c
@@ -1,7 +1,6 @@
+// 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>
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 7d7ed4242b8c..90c95615638a 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
/*
* f_mass_storage.c -- Mass Storage USB Composite Function
*
@@ -5,8 +6,6 @@
* Copyright (C) 2009 Samsung Electronics
* Author: Michal Nazarewicz <m.nazarewicz at samsung.com>
* All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
*/
/*
diff --git a/include/api_public.h b/include/api_public.h
index f5c89f3f1377..def103ce22fd 100644
--- a/include/api_public.h
+++ b/include/api_public.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */
/*
* (C) Copyright 2007-2008 Semihalf
*
* Written by: Rafal Jaworowski <raj at semihalf.com>
- *
- * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
*/
#ifndef _API_PUBLIC_H_
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index b2b654ca7a9a..aea0d9855bb6 100644
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
/*
* Copyright (C) 2018, STMicroelectronics - All Rights Reserved
*
* Configuration settings for the STM32MP15x CPU
- *
- * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
*/
#ifndef __CONFIG_H
diff --git a/include/miiphy.h b/include/miiphy.h
index fe8928a3a9d0..2da28e311a2b 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -1,6 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 OR IBM-pibs */
/*
- * SPDX-License-Identifier: GPL-2.0 IBM-pibs
- *
* Additions (C) Copyright 2009 Industrie Dial Face S.p.A.
*/
/*----------------------------------------------------------------------------+
diff --git a/include/power/stpmu1.h b/include/power/stpmu1.h
index 697e245b560c..61c58f3b7009 100644
--- a/include/power/stpmu1.h
+++ b/include/power/stpmu1.h
@@ -1,7 +1,6 @@
+/* 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 __PMIC_STPMU1_H_
diff --git a/include/ubispl.h b/include/ubispl.h
index 944653ed5ab4..1e5da94eb1fb 100644
--- a/include/ubispl.h
+++ b/include/ubispl.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL 2.0+ OR BSD-3-Clause */
/*
* Copyright (c) Thomas Gleixner <tglx at linutronix.de>
- *
- * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
*/
#ifndef __UBOOT_UBISPL_H
#define __UBOOT_UBISPL_H
diff --git a/lib/libfdt/fdt_region.c b/lib/libfdt/fdt_region.c
index 054c4b302f44..d3b9a60e994f 100644
--- a/lib/libfdt/fdt_region.c
+++ b/lib/libfdt/fdt_region.c
@@ -1,8 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause
/*
* libfdt - Flat Device Tree manipulation
* Copyright (C) 2013 Google, Inc
* Written by Simon Glass <sjg at chromium.org>
- * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
*/
#include <linux/libfdt_env.h>
diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c
index d972d031c6ba..4b7008d88fe9 100644
--- a/lib/libfdt/fdt_ro.c
+++ b/lib/libfdt/fdt_ro.c
@@ -1,7 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause
/*
* libfdt - Flat Device Tree manipulation
* Copyright (C) 2006 David Gibson, IBM Corporation.
- * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
*/
#include <linux/libfdt_env.h>
diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c
index 6dc8b764b3f5..487d39ef0247 100644
--- a/lib/lz4_wrapper.c
+++ b/lib/lz4_wrapper.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL 2.0+ OR BSD-3-Clause
/*
* Copyright 2015 Google Inc.
- *
- * SPDX-License-Identifier: GPL 2.0+ BSD-3-Clause
*/
#include <common.h>
diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
index 5b1a8cf4d493..2c1c987c1d1c 100644
--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause */
/*
* pylibfdt - Flat Device Tree manipulation in Python
* Copyright (C) 2017 Google, Inc.
* Written by Simon Glass <sjg at chromium.org>
- *
- * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
*/
%module libfdt
diff --git a/tools/relocate-rela.c b/tools/relocate-rela.c
index df968eb5fd1b..6a524014b73c 100644
--- a/tools/relocate-rela.c
+++ b/tools/relocate-rela.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-2-Clause
/*
* Copyright 2013 Freescale Semiconductor, Inc.
*
- * SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause
- *
* 64-bit and little-endian target only until we need to support a different
* arch that needs this.
*/
diff --git a/tools/stm32image.c b/tools/stm32image.c
index 437e384d371c..08b32ba87dd5 100644
--- a/tools/stm32image.c
+++ b/tools/stm32image.c
@@ -1,7 +1,6 @@
+// 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 <image.h>
--
2.7.4
More information about the U-Boot
mailing list