diff --git a/board/varisys/cyrus/Makefile b/board/varisys/cyrus/Makefile
index a7978a0..15b3fb2 100644
--- a/board/varisys/cyrus/Makefile
+++ b/board/varisys/cyrus/Makefile
@@ -1,6 +1,4 @@
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
+# SPDX-License-Identifier: GPL-2.0+
 
 obj-y	+= $(BOARD).o
 obj-y	+= ddr.o
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index 1daea06..4ccce8a 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/board/varisys/cyrus/cyrus.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Based on corenet_ds.c
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/varisys/cyrus/cyrus.h b/board/varisys/cyrus/cyrus.h
index 8cd52ba..df037a5 100644
--- a/board/varisys/cyrus/cyrus.h
+++ b/board/varisys/cyrus/cyrus.h
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier:    GPL-2.0+
- */
+/* SPDX-License-Identifier: GPL-2.0+ */
 
 #ifndef __CYRUS_H
 #define __CYRUS_H
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index 2ba7b3a..cac00e0 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Based on corenet_ds ddr code
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/varisys/cyrus/eth.c b/board/varisys/cyrus/eth.c
index fc2192a..9783abd 100644
--- a/board/varisys/cyrus/eth.c
+++ b/board/varisys/cyrus/eth.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Author Adrian Cox
  * Based somewhat on board/freescale/corenet_ds/eth_hydra.c
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/varisys/cyrus/law.c b/board/varisys/cyrus/law.c
index 91e1d85..8b1b118 100644
--- a/board/varisys/cyrus/law.c
+++ b/board/varisys/cyrus/law.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Author: Adrian Cox
  * Based on corenet_ds law files.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/varisys/cyrus/pci.c b/board/varisys/cyrus/pci.c
index 1853b19..a2df928 100644
--- a/board/varisys/cyrus/pci.c
+++ b/board/varisys/cyrus/pci.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2007-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/varisys/cyrus/tlb.c b/board/varisys/cyrus/tlb.c
index 3fa5864..b1af3e0 100644
--- a/board/varisys/cyrus/tlb.c
+++ b/board/varisys/cyrus/tlb.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Author: Adrian Cox
  * Based on corenet_ds tlb code
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>