From: Tom Rini Date: Fri, 18 May 2018 21:54:39 +0000 (-0400) Subject: Fixup various SPDX tags from the latest merge X-Git-Tag: v2018.07-rc1~132 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=855ff8e6dd58b01930d8b8b726e65310d546a0c9;p=u-boot Fixup various SPDX tags from the latest merge Signed-off-by: Tom Rini --- diff --git a/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi b/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi index 86e8da761d..06dd72527d 100644 --- a/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6qdl-icore-u-boot.dtsi" diff --git a/arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi b/arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi index 210b930264..bc5ed941b4 100644 --- a/arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6qdl-icore-rqs-u-boot.dtsi" diff --git a/arch/arm/dts/imx6dl-icore-u-boot.dtsi b/arch/arm/dts/imx6dl-icore-u-boot.dtsi index 5bd3df96f5..cfc9f8c741 100644 --- a/arch/arm/dts/imx6dl-icore-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-icore-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6qdl-icore-u-boot.dtsi" diff --git a/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi b/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi index d4c3c0bdf0..3af57ff8eb 100644 --- a/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi +++ b/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6qdl-u-boot.dtsi" diff --git a/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi b/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi index 86e8da761d..06dd72527d 100644 --- a/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi +++ b/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6qdl-icore-u-boot.dtsi" diff --git a/arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi b/arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi index 210b930264..bc5ed941b4 100644 --- a/arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi +++ b/arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6qdl-icore-rqs-u-boot.dtsi" diff --git a/arch/arm/dts/imx6q-icore-u-boot.dtsi b/arch/arm/dts/imx6q-icore-u-boot.dtsi index 5bd3df96f5..cfc9f8c741 100644 --- a/arch/arm/dts/imx6q-icore-u-boot.dtsi +++ b/arch/arm/dts/imx6q-icore-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6qdl-icore-u-boot.dtsi" diff --git a/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi b/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi index 458debfbab..158cadcedd 100644 --- a/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6qdl-u-boot.dtsi" diff --git a/arch/arm/dts/imx6qdl-icore-u-boot.dtsi b/arch/arm/dts/imx6qdl-icore-u-boot.dtsi index d45c20b10c..f95d49d00d 100644 --- a/arch/arm/dts/imx6qdl-icore-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-icore-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6qdl-u-boot.dtsi" diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi index e6363aa1c1..dffc21ba78 100644 --- a/arch/arm/dts/imx6qdl-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ / { diff --git a/arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi b/arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi index d1b77ba295..3141a07f04 100644 --- a/arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6ul-u-boot.dtsi" diff --git a/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi b/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi index 7d0cc154cf..6256b793d1 100644 --- a/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6ul-isiot-u-boot.dtsi" diff --git a/arch/arm/dts/imx6ul-isiot-u-boot.dtsi b/arch/arm/dts/imx6ul-isiot-u-boot.dtsi index f98c395747..aa8e9804bf 100644 --- a/arch/arm/dts/imx6ul-isiot-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-isiot-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imx6ul-u-boot.dtsi" diff --git a/arch/arm/dts/imx6ul-u-boot.dtsi b/arch/arm/dts/imx6ul-u-boot.dtsi index 08d7747e1c..eb190cf8c8 100644 --- a/arch/arm/dts/imx6ul-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-u-boot.dtsi @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ / { diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c index 478f673491..6ad7e31092 100644 --- a/board/bticino/mamoj/mamoj.c +++ b/board/bticino/mamoj/mamoj.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Simone CIANNI * Copyright (C) 2018 Raffaele RECALCATI * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c index c52183749f..c53bdce0ce 100644 --- a/board/bticino/mamoj/spl.c +++ b/board/bticino/mamoj/spl.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 Simone CIANNI * Copyright (C) 2018 Raffaele RECALCATI * Copyright (C) 2018 Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c index 611fd2a5df..e8f51769f6 100644 --- a/board/k+p/kp_imx53/kp_id_rev.c +++ b/board/k+p/kp_imx53/kp_id_rev.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma@denx.de @@ -6,8 +7,6 @@ * * Copyright (C) 2012 TQ-Systems GmbH * Daniel Gericke - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/board/k+p/kp_imx53/kp_id_rev.h b/board/k+p/kp_imx53/kp_id_rev.h index 31550673fe..aa64173926 100644 --- a/board/k+p/kp_imx53/kp_id_rev.h +++ b/board/k+p/kp_imx53/kp_id_rev.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma@denx.de @@ -6,8 +7,6 @@ * * Copyright (C) 2012 TQ-Systems GmbH * Daniel Gericke - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __KP_ID_REV_H_ diff --git a/board/k+p/kp_imx53/kp_imx53.c b/board/k+p/kp_imx53/kp_imx53.c index 7d2731208f..c80eed36c6 100644 --- a/board/k+p/kp_imx53/kp_imx53.c +++ b/board/k+p/kp_imx53/kp_imx53.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma@denx.de - * - * SPDX-License-Identifier: GPL-2.0+ */ #include diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h index 2f5e212b88..5a3c2d68b5 100644 --- a/include/configs/imx6dl-mamoj.h +++ b/include/configs/imx6dl-mamoj.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2018 Simone CIANNI * Copyright (C) 2018 Raffaele RECALCATI * Copyright (C) 2018 Jagan Teki * * Configuration settings for the BTicion i.MX6DL Mamoj board. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IMX6DL_MAMOJ_CONFIG_H diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h index c2eaf31760..530c3557d0 100644 --- a/include/configs/kp_imx53.h +++ b/include/configs/kp_imx53.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright (C) 2018 * Lukasz Majewski, DENX Software Engineering, lukma@denx.de - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H_