Fixup various SPDX tags from the latest merge

Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c
index 478f673..6ad7e31 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 c521837..c53bdce 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 611fd2a..e8f5176 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 3155067..aa64173 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 7d27312..c80eed3 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>