diff options
121 files changed, 121 insertions, 239 deletions
diff --git a/arch/arm/dts/bk4r1.dts b/arch/arm/dts/bk4r1.dts index 197e5ab..866b80e 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 6ea5f82..a7e3001 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 d453f5d..9cb3de1 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 ccc9023..0b0149b 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 908fbed..d069b60 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 400cd9e..8d0d559 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 c4b6adf..201e5fa 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 215e095..be99076 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 cf53ab0..f2a9a1d 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 118c45d..a9fc931 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 9611619..addb9ab 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@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 27670a8..c42cad7 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@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 3cc2077..ff40122 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@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 9a4b84f..94f0c67 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 1c4d362..607ecc6 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 4e1920b..ba36853 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@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 646e477..136de245 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@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 f46707d..4acbaf7 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@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 02000fc..36116f7 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 7b6ca1d..0be3f8d 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 b4a42cf..077caf3 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 b85b802..fbd6c78 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 04b1a71..541bcd3 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 69273a9..b0f8517 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 ef668a3..73e2683 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@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 9e3875d..c8bf9a0 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@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 c928e72..c2e7d86 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 f6c2105..a2cade7 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 f06cc23..f825506 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@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 94567eb..84cbebb 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@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 266fbcf..dc2acf4 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@baylibre.com> * Author: Jerome Brunet <jbrunet@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 f3eea8e..0385fb9 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@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. */ diff --git a/arch/arm/dts/pcm052.dts b/arch/arm/dts/pcm052.dts index 0985587..6489fdc 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 0fc4f54..ac931e1 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@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 aeb5b80..7bcca6a 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@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 ae0b0a4..bfb367a 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 3f03e13..575de44 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 a84156f..17c79d3 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 66ddf8d..b569307 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 59ff8bc..2e075406 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@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 072eaa6..de5e8f2 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@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 7b92caf..29e60dd 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 47dc0f9..432f744 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@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 284d5ed..d1e1cd5 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 ea2f715..3edd21c 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 764b3e4..30ea9e4 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 a9b7f81..fb4a4fb 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 f018b8b..5e578b1 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 3a5e30e..7495781 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 764b3e4..30ea9e4 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 564de91..8f1193c 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 31aaf70..337e0ea 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 4eec8e7..bb86a44 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 d2c961e..3584031 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 6d9e36d..612ed44 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@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 d10e089..b6939b0 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 ddfa079..094f842 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 352e470..8a5a821 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 1eca802..fa9fd29 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 2caa939..5b8be93 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 d2805c5..f815b83 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@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 96fa826..d0267ce 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@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 f216f27..1bf8881 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@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 d073294..aef733b 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@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 658ffce..32ab975 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@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 8b730cd..57fe006 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@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 c4aed8c..00c3ffd 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@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 759ec9d..f1fb97d 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@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 c8fd69f..1fcb16c 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@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 08f2678..22d8f7e 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 6e9230b..b8d6f7b 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 1986a0b..b57acc9 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@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 c2f104a..923dc24 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 477d8de..5198eee 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 02d0ce8..3f33d97 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 24dfcbe..0a6b937 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 237aa8d..62e9f43 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 9b0e894..5b6c384 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@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 af55bba..0f296f3 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@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 a495c53..cdb087c 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 34e59c6..cde5850 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 f9f3bf9..dfcbbd2 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 ecb4c98..7688b3e 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 b635001..1857584 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 c7a2789..2090402 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 a8c20d1..41d4b40 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 bfb3e50..b56f0c5 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 5641745..66b94f5 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 6c6ebea..09d4700 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 0d3ac88..1c42fee 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 465133f..fdcbbdf 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 eaf45b7..8188075 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 42a39d0..7d7ad8b 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 03f900a..956768f 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 b7e5f24..f3db0d6 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 84c971c..cc39fa6 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 e3bea5e..6b04fbc 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 cb7d92f..530f059 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 8308933..a7939e9 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@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 c67aa44..ed32585 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 72b9dcb..b58f42d 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@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 a81a8e7..eeb1cbe 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@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 9227881..9e40b46 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@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 4615365..a765c4f 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 9f05cd4..79eb028 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 ffe50d9..c7c3ba7 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 b77d823..3cd0161 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 82c254b..a606b2b 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 4dc84d0..a40f992 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 7d7ed42..90c9561 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@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 f5c89f3..def103c 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@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 b2b654c..aea0d98 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 fe8928a..2da28e3 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 697e245..61c58f3 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 944653e..1e5da94 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@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 054c4b3..d3b9a60 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@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 d972d03..4b7008d 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 6dc8b76..487d39e 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 5b1a8cf..2c1c987 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@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 df968eb..6a52401 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 437e384..08b32ba 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> |