Fixup various SPDX tags from the latest merge

Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi b/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi
index 86e8da7..06dd725 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 210b930..bc5ed94 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 5bd3df9..cfc9f8c 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 d4c3c0b..3af57ff 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 86e8da7..06dd725 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 210b930..bc5ed94 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 5bd3df9..cfc9f8c 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 458debf..158cadc 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 d45c20b..f95d49d 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 e6363aa..dffc21b 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 d1b77ba..3141a07 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 7d0cc15..6256b79 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 f98c395..aa8e980 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 08d7747..eb190cf 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+
  */
 
 / {