15 files changed, 15 insertions, 34 deletions
diff --git a/board/imgtec/boston/Makefile b/board/imgtec/boston/Makefile
index d3fd49d285..4271a4def3 100644
--- a/board/imgtec/boston/Makefile
+++ b/board/imgtec/boston/Makefile
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (C) 2016 Imagination Technologies
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
 
 obj-y += checkboard.o
 obj-y += ddr.o
diff --git a/board/imgtec/boston/boston-lcd.h b/board/imgtec/boston/boston-lcd.h
index 9f5c1b9005..5f5cd0fe12 100644
--- a/board/imgtec/boston/boston-lcd.h
+++ b/board/imgtec/boston/boston-lcd.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2016 Imagination Technologies
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #ifndef __BOARD_BOSTON_LCD_H__
diff --git a/board/imgtec/boston/boston-regs.h b/board/imgtec/boston/boston-regs.h
index b9dfbb4763..673a61cfba 100644
--- a/board/imgtec/boston/boston-regs.h
+++ b/board/imgtec/boston/boston-regs.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2016 Imagination Technologies
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #ifndef __BOARD_BOSTON_REGS_H__
diff --git a/board/imgtec/boston/checkboard.c b/board/imgtec/boston/checkboard.c
index 93eae7f603..46ec1e8d9c 100644
--- a/board/imgtec/boston/checkboard.c
+++ b/board/imgtec/boston/checkboard.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2016 Imagination Technologies
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #include <common.h>
diff --git a/board/imgtec/boston/config.mk b/board/imgtec/boston/config.mk
index 0ba8802da0..8cfc9c6894 100644
--- a/board/imgtec/boston/config.mk
+++ b/board/imgtec/boston/config.mk
@@ -1,6 +1,4 @@
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
+# SPDX-License-Identifier: GPL-2.0+
 
 quiet_cmd_srec_cat = SRECCAT $@
       cmd_srec_cat = srec_cat -output $@ -$2 \
diff --git a/board/imgtec/boston/ddr.c b/board/imgtec/boston/ddr.c
index 3479b98b88..3f8a5c0d8e 100644
--- a/board/imgtec/boston/ddr.c
+++ b/board/imgtec/boston/ddr.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2016 Imagination Technologies
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #include <common.h>
diff --git a/board/imgtec/boston/dt.c b/board/imgtec/boston/dt.c
index b34f9bc205..c7ae90418f 100644
--- a/board/imgtec/boston/dt.c
+++ b/board/imgtec/boston/dt.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2016 Imagination Technologies
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #include <common.h>
diff --git a/board/imgtec/boston/lowlevel_init.S b/board/imgtec/boston/lowlevel_init.S
index 02a75a8ee7..2761bf2cd5 100644
--- a/board/imgtec/boston/lowlevel_init.S
+++ b/board/imgtec/boston/lowlevel_init.S
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2016 Imagination Technologies
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #include <config.h>
diff --git a/board/imgtec/malta/Makefile b/board/imgtec/malta/Makefile
index 19dd3a3c3b..d0d84010fc 100644
--- a/board/imgtec/malta/Makefile
+++ b/board/imgtec/malta/Makefile
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2003-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 obj-y	= malta.o
 obj-y	+= lowlevel_init.o
diff --git a/board/imgtec/malta/flash-malta-boot.tcl b/board/imgtec/malta/flash-malta-boot.tcl
index 0eedf07ace..972002a8e9 100644
--- a/board/imgtec/malta/flash-malta-boot.tcl
+++ b/board/imgtec/malta/flash-malta-boot.tcl
@@ -1,10 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (C) 2013 Imagination Technologies
 #
 # Programs a MIPS Malta boot flash with a flat binary image.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 proc flash-boot { binfile } {
   puts "flash monitor binary $binfile"
diff --git a/board/imgtec/malta/lowlevel_init.S b/board/imgtec/malta/lowlevel_init.S
index 6df4d9f719..ecb4424fd9 100644
--- a/board/imgtec/malta/lowlevel_init.S
+++ b/board/imgtec/malta/lowlevel_init.S
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #include <config.h>
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index de81aa01f0..b742e3738f 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
  * Copyright (C) 2013 Imagination Technologies
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #include <common.h>
diff --git a/board/imgtec/malta/superio.c b/board/imgtec/malta/superio.c
index d6ada4f87d..aba11e25be 100644
--- a/board/imgtec/malta/superio.c
+++ b/board/imgtec/malta/superio.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013 Imagination Technologies
  * Author: Paul Burton <paul.burton@mips.com>
  *
  * Setup code for the FDC37M817 super I/O controller
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/imgtec/malta/superio.h b/board/imgtec/malta/superio.h
index f0ae1422b8..11e9cef978 100644
--- a/board/imgtec/malta/superio.h
+++ b/board/imgtec/malta/superio.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Imagination Technologies
  * Author: Paul Burton <paul.burton@mips.com>
  *
  * Setup code for the FDC37M817 super I/O controller
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __BOARD_MALTA_SUPERIO_H__
diff --git a/board/imgtec/xilfpga/xilfpga.c b/board/imgtec/xilfpga/xilfpga.c
index 841d61459d..86645155e6 100644
--- a/board/imgtec/xilfpga/xilfpga.c
+++ b/board/imgtec/xilfpga/xilfpga.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Imagination Technologies MIPSfpga platform code
  *
@@ -5,8 +6,6 @@
  *
  * Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  */
 
 #include <common.h>