diff --git a/board/ge/common/Makefile b/board/ge/common/Makefile
index f5be11b..8a21dcb 100644
--- a/board/ge/common/Makefile
+++ b/board/ge/common/Makefile
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright 2017 General Electric Company
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 obj-y  := vpd_reader.o ge_common.o
diff --git a/board/ge/common/ge_common.c b/board/ge/common/ge_common.c
index c826096..4e6ef9c 100644
--- a/board/ge/common/ge_common.c
+++ b/board/ge/common/ge_common.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2017 General Electric Company
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/board/ge/common/ge_common.h b/board/ge/common/ge_common.h
index b28aada..d33486d 100644
--- a/board/ge/common/ge_common.h
+++ b/board/ge/common/ge_common.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2017 General Electric Company
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 void check_time(void);
diff --git a/board/ge/common/vpd_reader.c b/board/ge/common/vpd_reader.c
index 7367427..c471583 100644
--- a/board/ge/common/vpd_reader.c
+++ b/board/ge/common/vpd_reader.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2016 General Electric Company
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include "vpd_reader.h"
diff --git a/board/ge/common/vpd_reader.h b/board/ge/common/vpd_reader.h
index 4abba8f..e60acf3 100644
--- a/board/ge/common/vpd_reader.h
+++ b/board/ge/common/vpd_reader.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2016 General Electric Company
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include "common.h"