9 files changed, 9 insertions, 18 deletions
diff --git a/tools/binman/test/bss_data.c b/tools/binman/test/bss_data.c
index e0305c382c..79537c31b6 100644
--- a/tools/binman/test/bss_data.c
+++ b/tools/binman/test/bss_data.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2016 Google, Inc
  *
- * SPDX-License-Identifier:     GPL-2.0+
- *
  * Simple program to create a _dt_ucode_base_size symbol which can be read
  * by binutils. This is used by binman tests.
  */
diff --git a/tools/binman/test/bss_data.lds b/tools/binman/test/bss_data.lds
index 6b2fe09d35..306dab5043 100644
--- a/tools/binman/test/bss_data.lds
+++ b/tools/binman/test/bss_data.lds
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2016 Google, Inc
- *
- * SPDX-License-Identifier:      GPL-2.0+
  */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
diff --git a/tools/binman/test/u_boot_binman_syms.c b/tools/binman/test/u_boot_binman_syms.c
index a975476944..d8371610a5 100644
--- a/tools/binman/test/u_boot_binman_syms.c
+++ b/tools/binman/test/u_boot_binman_syms.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2017 Google, Inc
  *
- * SPDX-License-Identifier:     GPL-2.0+
- *
  * Simple program to create some binman symbols. This is used by binman tests.
  */
 
diff --git a/tools/binman/test/u_boot_binman_syms.lds b/tools/binman/test/u_boot_binman_syms.lds
index d3130cdeb3..29cf9d0e54 100644
--- a/tools/binman/test/u_boot_binman_syms.lds
+++ b/tools/binman/test/u_boot_binman_syms.lds
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2016 Google, Inc
- *
- * SPDX-License-Identifier:      GPL-2.0+
  */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
diff --git a/tools/binman/test/u_boot_binman_syms_bad.lds b/tools/binman/test/u_boot_binman_syms_bad.lds
index 0b474b5374..849d158ac8 100644
--- a/tools/binman/test/u_boot_binman_syms_bad.lds
+++ b/tools/binman/test/u_boot_binman_syms_bad.lds
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2016 Google, Inc
- *
- * SPDX-License-Identifier:      GPL-2.0+
  */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
diff --git a/tools/binman/test/u_boot_binman_syms_size.c b/tools/binman/test/u_boot_binman_syms_size.c
index ee4c048b28..7224bc1863 100644
--- a/tools/binman/test/u_boot_binman_syms_size.c
+++ b/tools/binman/test/u_boot_binman_syms_size.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2017 Google, Inc
  *
- * SPDX-License-Identifier:     GPL-2.0+
- *
  * Simple program to create some binman symbols. This is used by binman tests.
  */
 
diff --git a/tools/binman/test/u_boot_no_ucode_ptr.c b/tools/binman/test/u_boot_no_ucode_ptr.c
index c4a2b85fc9..24cdb909d0 100644
--- a/tools/binman/test/u_boot_no_ucode_ptr.c
+++ b/tools/binman/test/u_boot_no_ucode_ptr.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2016 Google, Inc
  *
- * SPDX-License-Identifier:     GPL-2.0+
- *
  * Simple program to create a bad _dt_ucode_base_size symbol to create an
  * error when it is used. This is used by binman tests.
  */
diff --git a/tools/binman/test/u_boot_ucode_ptr.c b/tools/binman/test/u_boot_ucode_ptr.c
index 734d54f0d4..243c8e9e1a 100644
--- a/tools/binman/test/u_boot_ucode_ptr.c
+++ b/tools/binman/test/u_boot_ucode_ptr.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2016 Google, Inc
  *
- * SPDX-License-Identifier:     GPL-2.0+
- *
  * Simple program to create a _dt_ucode_base_size symbol which can be read
  * by binutils. This is used by binman tests.
  */
diff --git a/tools/binman/test/u_boot_ucode_ptr.lds b/tools/binman/test/u_boot_ucode_ptr.lds
index 167debfe34..0cf9b762b5 100644
--- a/tools/binman/test/u_boot_ucode_ptr.lds
+++ b/tools/binman/test/u_boot_ucode_ptr.lds
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2016 Google, Inc
- *
- * SPDX-License-Identifier:      GPL-2.0+
  */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")