diff --git a/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi b/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi
index 86e8da761d16ca4ae5b682b239c1a5f89b7b0169..06dd72527d61ca943c58f20b3ea62d40200bb8e6 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 <jagan@amarulasolutions.com>
- *
- * 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 210b9302643a47324492501210319906bd53950f..bc5ed941b452b0f556a65d6e7ca4a728b411539c 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 <jagan@amarulasolutions.com>
- *
- * 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 5bd3df96f51855e2daf029b6b59887fa3e9118c7..cfc9f8c74113313144dba4279d33c47dbb60aa60 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 <jagan@amarulasolutions.com>
- *
- * 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 d4c3c0bdf0f710e7b7dfbc3d61b560e07950f917..3af57ff8eb821c1e75a83508ce288927d05ea68e 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 <jagan@amarulasolutions.com>
- *
- * 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 86e8da761d16ca4ae5b682b239c1a5f89b7b0169..06dd72527d61ca943c58f20b3ea62d40200bb8e6 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 <jagan@amarulasolutions.com>
- *
- * 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 210b9302643a47324492501210319906bd53950f..bc5ed941b452b0f556a65d6e7ca4a728b411539c 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 <jagan@amarulasolutions.com>
- *
- * 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 5bd3df96f51855e2daf029b6b59887fa3e9118c7..cfc9f8c74113313144dba4279d33c47dbb60aa60 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 <jagan@amarulasolutions.com>
- *
- * 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 458debfbabd3ed1898f1b9dea86af986fd128c3b..158cadceddce932ee66bb53ddd75d5ed5b5f4694 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 <jagan@amarulasolutions.com>
- *
- * 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 d45c20b10ca01bed8a2ab9917bc15ebc12ba4fec..f95d49d00d665899ded69bfd5dfc219da1c832dc 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 <jagan@amarulasolutions.com>
- *
- * 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 e6363aa1c1ac5a028f02b0c2650201c7c231b574..dffc21ba78c7a2330b3fc7b689dd1343dbb60eaf 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 <jagan@amarulasolutions.com>
- *
- * 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 d1b77ba295121e84e47d412252952151d26ff882..3141a07f0484375610aea062960a96b8f887562b 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 <jagan@amarulasolutions.com>
- *
- * 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 7d0cc154cf2de6a5194723fcaa98a76ea12f964b..6256b793d10a6c0741945e8207375697d6a18689 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 <jagan@amarulasolutions.com>
- *
- * 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 f98c3957472b9a69ffd12ca4c472c68fbdcd2620..aa8e9804bfe3d1660bb3ccae6c432c13fa946212 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 <jagan@amarulasolutions.com>
- *
- * 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 08d7747e1c36b4e12f404624fdd54328aa43cafc..eb190cf8c848e4820bb9e7d745deff26976134e5 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 <jagan@amarulasolutions.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 / {
diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c
index 478f6734917c06641c53b86592c78a875f9234e9..6ad7e31092b351bdabb6ad1aee029efb4ffcc0cf 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 <simone.cianni@bticino.it>
  * Copyright (C) 2018 Raffaele RECALCATI <raffaele.recalcati@bticino.it>
  * Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
index c52183749f8ea8353bbfaba99d3ed2c8cbd3044a..c53bdce0ceb0cb1247f23f36aba0dd84575e0912 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 <simone.cianni@bticino.it>
  * Copyright (C) 2018 Raffaele RECALCATI <raffaele.recalcati@bticino.it>
  * Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/k+p/kp_imx53/kp_id_rev.c b/board/k+p/kp_imx53/kp_id_rev.c
index 611fd2a5dfeea4570b7ca349717107f7be8eb782..e8f51769f667213302b13bbaad03e82287042986 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 <daniel.gericke@tqs.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/k+p/kp_imx53/kp_id_rev.h b/board/k+p/kp_imx53/kp_id_rev.h
index 31550673fedb76cffb53f30467a687d7fea53609..aa64173926ccfe77984a71164feba39f4ed6c906 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 <daniel.gericke@tqs.de>
- *
- * 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 7d2731208ff81185f1bd2a6971b1f41e78cdaef2..c80eed36c62304ed904c108435f019178c9370e1 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 <common.h>
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 2f5e212b8889b1845ccf8ad9685de39243ba5ff7..5a3c2d68b5d0c0d212ce952071628c1bab95e661 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 <simone.cianni@bticino.it>
  * Copyright (C) 2018 Raffaele RECALCATI <raffaele.recalcati@bticino.it>
  * Copyright (C) 2018 Jagan Teki <jagan@amarulasolutions.com>
  *
  * 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 c2eaf3176015dbb922bc6aaf66ccace5d938befa..530c3557d03ed1c2145e487ae0d6438174cbedd5 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_