diff --git a/board/armadeus/apf27/apf27.c b/board/armadeus/apf27/apf27.c
index 1abfe88..0f0c8a4 100644
--- a/board/armadeus/apf27/apf27.c
+++ b/board/armadeus/apf27/apf27.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2008-2013 Eric Jarrige <eric.jarrige@armadeus.org>
  *
  * based on the files by
  * Sascha Hauer, Pengutronix
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/armadeus/apf27/apf27.h b/board/armadeus/apf27/apf27.h
index 64e7e4d..9c3cfd3 100644
--- a/board/armadeus/apf27/apf27.h
+++ b/board/armadeus/apf27/apf27.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2008-2013 Eric Jarrige <eric.jarrige@armadeus.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __APF27_H
diff --git a/board/armadeus/apf27/fpga.c b/board/armadeus/apf27/fpga.c
index 65a4812..e9af8dd 100644
--- a/board/armadeus/apf27/fpga.c
+++ b/board/armadeus/apf27/fpga.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002-2013
  * Eric Jarrige <eric.jarrige@armadeus.org>
@@ -6,8 +7,6 @@
  * Rich Ireland, Enterasys Networks, rireland@enterasys.com
  * and
  * Keith Outwater, keith_outwater@mvis.com
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 #include <common.h>
 
diff --git a/board/armadeus/apf27/fpga.h b/board/armadeus/apf27/fpga.h
index 84a5244..d6394e9 100644
--- a/board/armadeus/apf27/fpga.h
+++ b/board/armadeus/apf27/fpga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2002-2013
  * Eric Jarrige <eric.jarrige@armadeus.org>
@@ -6,8 +7,6 @@
  * Rich Ireland, Enterasys Networks, rireland@enterasys.com
  * and
  * Keith Outwater, keith_outwater@mvis.com
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 extern void APF27_init_fpga(void);
 
diff --git a/board/armadeus/apf27/lowlevel_init.S b/board/armadeus/apf27/lowlevel_init.S
index 2f795e4..0991b7d 100644
--- a/board/armadeus/apf27/lowlevel_init.S
+++ b/board/armadeus/apf27/lowlevel_init.S
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2013 Philippe Reynes <tremyfr@yahoo.fr>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <config.h>
diff --git a/board/armadeus/opos6uldev/Makefile b/board/armadeus/opos6uldev/Makefile
index fd14fd7..cff8eb2 100644
--- a/board/armadeus/opos6uldev/Makefile
+++ b/board/armadeus/opos6uldev/Makefile
@@ -1,6 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0+
 # (C) Copyright 2017 Armadeus Systems
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 obj-y  := board.o
diff --git a/board/armadeus/opos6uldev/board.c b/board/armadeus/opos6uldev/board.c
index 0679acd..4faa997 100644
--- a/board/armadeus/opos6uldev/board.c
+++ b/board/armadeus/opos6uldev/board.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2018 Armadeus Systems
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <asm/arch/clock.h>