3 files changed, 3 insertions, 7 deletions
diff --git a/board/quipos/cairo/Makefile b/board/quipos/cairo/Makefile
index 445088f27bd..ec2c83cc890 100644
--- a/board/quipos/cairo/Makefile
+++ b/board/quipos/cairo/Makefile
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2014 DENX Software Engineering
 # Written-By: Albert ARIBAUD <albert.aribaud@3adev.fr>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 obj-y	:= cairo.o
diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c
index 6cf54095f54..8999542a7dd 100644
--- a/board/quipos/cairo/cairo.c
+++ b/board/quipos/cairo/cairo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2014 DENX
  * Written-by: Albert ARIBAUD <albert.aribaud@3adev.fr>
@@ -7,8 +8,6 @@
  * Itself derived from Beagle Board and 3430 SDP code by
  *	Richard Woodruff <r-woodruff2@ti.com>
  *	Syed Mohammed Khasim <khasim@ti.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <dm.h>
diff --git a/board/quipos/cairo/cairo.h b/board/quipos/cairo/cairo.h
index 50734d01041..f57a6081d82 100644
--- a/board/quipos/cairo/cairo.h
+++ b/board/quipos/cairo/cairo.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) DENX
  * Written-by: Albert ARIBAUD <albert.aribaud@3adev.fr>
  *
  * Original code (C) Copyright 2010
  * Robert Aigner (ra@spiid.net)
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #ifndef _EVM_H_
 #define _EVM_H_