diff --git a/board/micronas/vct/Makefile b/board/micronas/vct/Makefile
index ed28cb8..d82c28d 100644
--- a/board/micronas/vct/Makefile
+++ b/board/micronas/vct/Makefile
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 obj-y := vct.o
 obj-y += ebi.o
diff --git a/board/micronas/vct/bcu.h b/board/micronas/vct/bcu.h
index 19ff978..f52833a 100644
--- a/board/micronas/vct/bcu.h
+++ b/board/micronas/vct/bcu.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _BCU_H
diff --git a/board/micronas/vct/dcgu.c b/board/micronas/vct/dcgu.c
index 562c827..e72d57f 100644
--- a/board/micronas/vct/dcgu.c
+++ b/board/micronas/vct/dcgu.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Original Author Guenter Gebhardt
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/dcgu.h b/board/micronas/vct/dcgu.h
index 36fba33..0f2277f 100644
--- a/board/micronas/vct/dcgu.h
+++ b/board/micronas/vct/dcgu.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _DCGU_H
diff --git a/board/micronas/vct/ebi.c b/board/micronas/vct/ebi.c
index 8a2c2dc..8a73086 100644
--- a/board/micronas/vct/ebi.c
+++ b/board/micronas/vct/ebi.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/ebi.h b/board/micronas/vct/ebi.h
index efa36cf..ea5b5cf 100644
--- a/board/micronas/vct/ebi.h
+++ b/board/micronas/vct/ebi.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __EBI__
diff --git a/board/micronas/vct/ebi_nor_flash.c b/board/micronas/vct/ebi_nor_flash.c
index 80fbc84..548443e 100644
--- a/board/micronas/vct/ebi_nor_flash.c
+++ b/board/micronas/vct/ebi_nor_flash.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/ebi_onenand.c b/board/micronas/vct/ebi_onenand.c
index ef892ca..862ce26 100644
--- a/board/micronas/vct/ebi_onenand.c
+++ b/board/micronas/vct/ebi_onenand.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/ebi_smc911x.c b/board/micronas/vct/ebi_smc911x.c
index 2628f99..9e59f0a 100644
--- a/board/micronas/vct/ebi_smc911x.c
+++ b/board/micronas/vct/ebi_smc911x.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/ehci.c b/board/micronas/vct/ehci.c
index 2362669..2d6966c 100644
--- a/board/micronas/vct/ehci.c
+++ b/board/micronas/vct/ehci.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Original Author Guenter Gebhardt
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/gpio.c b/board/micronas/vct/gpio.c
index 1eaa89f..776bb2d 100644
--- a/board/micronas/vct/gpio.c
+++ b/board/micronas/vct/gpio.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/scc.c b/board/micronas/vct/scc.c
index 8dbf410..6621231 100644
--- a/board/micronas/vct/scc.c
+++ b/board/micronas/vct/scc.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/scc.h b/board/micronas/vct/scc.h
index 7cadc92..48cae55 100644
--- a/board/micronas/vct/scc.h
+++ b/board/micronas/vct/scc.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _SCC_H
diff --git a/board/micronas/vct/top.c b/board/micronas/vct/top.c
index 4e8e410..fa039ee 100644
--- a/board/micronas/vct/top.c
+++ b/board/micronas/vct/top.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/vct.c b/board/micronas/vct/vct.c
index 510746d..af3f11e 100644
--- a/board/micronas/vct/vct.c
+++ b/board/micronas/vct/vct.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/micronas/vct/vct.h b/board/micronas/vct/vct.h
index 67da6a8..22b35b2 100644
--- a/board/micronas/vct/vct.h
+++ b/board/micronas/vct/vct.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <asm/io.h>
diff --git a/board/micronas/vct/vcth/reg_dcgu.h b/board/micronas/vct/vcth/reg_dcgu.h
index 2c7f52a..a598ad0 100644
--- a/board/micronas/vct/vcth/reg_dcgu.h
+++ b/board/micronas/vct/vcth/reg_dcgu.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008-2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #define DCGU_BASE		0x00084000
diff --git a/board/micronas/vct/vcth/reg_ebi.h b/board/micronas/vct/vcth/reg_ebi.h
index 43728d1..a2a3648 100644
--- a/board/micronas/vct/vcth/reg_ebi.h
+++ b/board/micronas/vct/vcth/reg_ebi.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _REG_EBI_PREMIUM_H_
diff --git a/board/micronas/vct/vcth/reg_fwsram.h b/board/micronas/vct/vcth/reg_fwsram.h
index 271baa4..6dafa1b 100644
--- a/board/micronas/vct/vcth/reg_fwsram.h
+++ b/board/micronas/vct/vcth/reg_fwsram.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/board/micronas/vct/vcth/reg_gpio.h b/board/micronas/vct/vcth/reg_gpio.h
index 43752c3..0660200 100644
--- a/board/micronas/vct/vcth/reg_gpio.h
+++ b/board/micronas/vct/vcth/reg_gpio.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #define GPIO1_BASE		0x00088000
diff --git a/board/micronas/vct/vcth/reg_scc.h b/board/micronas/vct/vcth/reg_scc.h
index 726e438..928ad72 100644
--- a/board/micronas/vct/vcth/reg_scc.h
+++ b/board/micronas/vct/vcth/reg_scc.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _REG_SCC_PREMIUM_H_
diff --git a/board/micronas/vct/vcth/reg_usbh.h b/board/micronas/vct/vcth/reg_usbh.h
index 44b7c4a..57f9402 100644
--- a/board/micronas/vct/vcth/reg_usbh.h
+++ b/board/micronas/vct/vcth/reg_usbh.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #define USBH_BASE		0x00080000
diff --git a/board/micronas/vct/vcth/reg_wdt.h b/board/micronas/vct/vcth/reg_wdt.h
index f1a5073..84572a1 100644
--- a/board/micronas/vct/vcth/reg_wdt.h
+++ b/board/micronas/vct/vcth/reg_wdt.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #define WDT_BASE		0x000b0000
diff --git a/board/micronas/vct/vcth2/reg_ebi.h b/board/micronas/vct/vcth2/reg_ebi.h
index 0c21cd9..ed9368d 100644
--- a/board/micronas/vct/vcth2/reg_ebi.h
+++ b/board/micronas/vct/vcth2/reg_ebi.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _REG_EBI_PREMIUM_H_
diff --git a/board/micronas/vct/vctv/reg_dcgu.h b/board/micronas/vct/vctv/reg_dcgu.h
index c4c7e8b..9e5c6fd 100644
--- a/board/micronas/vct/vctv/reg_dcgu.h
+++ b/board/micronas/vct/vctv/reg_dcgu.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #define DCGU_BASE		0x0004c000
diff --git a/board/micronas/vct/vctv/reg_ebi.h b/board/micronas/vct/vctv/reg_ebi.h
index edccea0..d9b4770 100644
--- a/board/micronas/vct/vctv/reg_ebi.h
+++ b/board/micronas/vct/vctv/reg_ebi.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
  *
  * Copyright (C) 2006 Micronas GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _REG_EBI_PLATINUMAVC_H_
diff --git a/board/micronas/vct/vctv/reg_gpio.h b/board/micronas/vct/vctv/reg_gpio.h
index 6ff0ce4..b1859a4 100644
--- a/board/micronas/vct/vctv/reg_gpio.h
+++ b/board/micronas/vct/vctv/reg_gpio.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #define GPIO1_BASE		0x00044000
diff --git a/board/micronas/vct/vctv/reg_wdt.h b/board/micronas/vct/vctv/reg_wdt.h
index 48e8aeb..2bad075 100644
--- a/board/micronas/vct/vctv/reg_wdt.h
+++ b/board/micronas/vct/vctv/reg_wdt.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008 Stefan Roese <sr@denx.de>, DENX Software Engineering
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #define WDT_BASE		0x00040000