summaryrefslogtreecommitdiff
path: root/tools/binman
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-05-06 17:58:06 -0400
committerTom Rini <trini@konsulko.com>2018-05-07 09:34:12 -0400
commit83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch)
tree5e5d1b40b52aaf96b707e0da2474573306d22f7b /tools/binman
parent7ce85318cfff5fd82a059131761559cba7fef309 (diff)
SPDX: Convert all of our single license tags to Linux Kernel style
When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'tools/binman')
-rw-r--r--tools/binman/README4
-rwxr-xr-xtools/binman/binman.py3
-rw-r--r--tools/binman/cmdline.py3
-rw-r--r--tools/binman/control.py3
-rw-r--r--tools/binman/elf.py3
-rw-r--r--tools/binman/elf_test.py4
-rw-r--r--tools/binman/entry_test.py4
-rw-r--r--tools/binman/etype/_testing.py3
-rw-r--r--tools/binman/etype/blob.py3
-rw-r--r--tools/binman/etype/entry.py3
-rw-r--r--tools/binman/etype/intel_cmc.py3
-rw-r--r--tools/binman/etype/intel_descriptor.py3
-rw-r--r--tools/binman/etype/intel_fsp.py3
-rw-r--r--tools/binman/etype/intel_me.py3
-rw-r--r--tools/binman/etype/intel_mrc.py3
-rw-r--r--tools/binman/etype/intel_vbt.py4
-rw-r--r--tools/binman/etype/intel_vga.py3
-rw-r--r--tools/binman/etype/u_boot.py3
-rw-r--r--tools/binman/etype/u_boot_dtb.py3
-rw-r--r--tools/binman/etype/u_boot_dtb_with_ucode.py5
-rw-r--r--tools/binman/etype/u_boot_img.py3
-rw-r--r--tools/binman/etype/u_boot_nodtb.py3
-rw-r--r--tools/binman/etype/u_boot_spl.py3
-rw-r--r--tools/binman/etype/u_boot_spl_bss_pad.py3
-rw-r--r--tools/binman/etype/u_boot_spl_dtb.py3
-rw-r--r--tools/binman/etype/u_boot_spl_nodtb.py3
-rw-r--r--tools/binman/etype/u_boot_spl_with_ucode_ptr.py3
-rw-r--r--tools/binman/etype/u_boot_ucode.py3
-rw-r--r--tools/binman/etype/u_boot_with_ucode_ptr.py3
-rw-r--r--tools/binman/etype/x86_start16.py3
-rw-r--r--tools/binman/etype/x86_start16_spl.py3
-rw-r--r--tools/binman/fdt_test.py4
-rw-r--r--tools/binman/ftest.py4
-rw-r--r--tools/binman/image.py3
-rw-r--r--tools/binman/image_test.py4
-rw-r--r--tools/binman/test/bss_data.c3
-rw-r--r--tools/binman/test/bss_data.lds3
-rw-r--r--tools/binman/test/u_boot_binman_syms.c3
-rw-r--r--tools/binman/test/u_boot_binman_syms.lds3
-rw-r--r--tools/binman/test/u_boot_binman_syms_bad.lds3
-rw-r--r--tools/binman/test/u_boot_binman_syms_size.c3
-rw-r--r--tools/binman/test/u_boot_no_ucode_ptr.c3
-rw-r--r--tools/binman/test/u_boot_ucode_ptr.c3
-rw-r--r--tools/binman/test/u_boot_ucode_ptr.lds3
44 files changed, 45 insertions, 96 deletions
diff --git a/tools/binman/README b/tools/binman/README
index 7f558ec6a9a..b20098177ee 100644
--- a/tools/binman/README
+++ b/tools/binman/README
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
Introduction
------------
diff --git a/tools/binman/binman.py b/tools/binman/binman.py
index 1c8e8dbff65..fa2f551f554 100755
--- a/tools/binman/binman.py
+++ b/tools/binman/binman.py
@@ -1,10 +1,9 @@
#!/usr/bin/env python2
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Creates binary images from input files controlled by a description
#
diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py
index 233d5e1d1ac..e9e0434ab36 100644
--- a/tools/binman/cmdline.py
+++ b/tools/binman/cmdline.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Command-line parser for binman
#
diff --git a/tools/binman/control.py b/tools/binman/control.py
index ffa2bbd80f6..bc8ed8e37ae 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Creates binary images from input files controlled by a description
#
diff --git a/tools/binman/elf.py b/tools/binman/elf.py
index 80ff2253f03..50085a3893a 100644
--- a/tools/binman/elf.py
+++ b/tools/binman/elf.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Handle various things related to ELF images
#
diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py
index e5fc28258dc..4abde121bd1 100644
--- a/tools/binman/elf_test.py
+++ b/tools/binman/elf_test.py
@@ -1,9 +1,7 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2017 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Test for the elf module
from contextlib import contextmanager
diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py
index caa523ebf89..6fa735ed596 100644
--- a/tools/binman/entry_test.py
+++ b/tools/binman/entry_test.py
@@ -1,9 +1,7 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Test for the Entry class
import collections
diff --git a/tools/binman/etype/_testing.py b/tools/binman/etype/_testing.py
index 1783098c01c..b166a71c4a9 100644
--- a/tools/binman/etype/_testing.py
+++ b/tools/binman/etype/_testing.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for testing purposes. Not used in real images.
#
diff --git a/tools/binman/etype/blob.py b/tools/binman/etype/blob.py
index def21640b56..10e59e980d6 100644
--- a/tools/binman/etype/blob.py
+++ b/tools/binman/etype/blob.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for blobs, which are binary objects read from files
#
diff --git a/tools/binman/etype/entry.py b/tools/binman/etype/entry.py
index 5541887d475..c331312c491 100644
--- a/tools/binman/etype/entry.py
+++ b/tools/binman/etype/entry.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Base class for all entries
#
diff --git a/tools/binman/etype/intel_cmc.py b/tools/binman/etype/intel_cmc.py
index 30676c8ad05..07cad2eecce 100644
--- a/tools/binman/etype/intel_cmc.py
+++ b/tools/binman/etype/intel_cmc.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for Intel Chip Microcode binary blob
#
diff --git a/tools/binman/etype/intel_descriptor.py b/tools/binman/etype/intel_descriptor.py
index 6435749e7cd..4e0c85b92ae 100644
--- a/tools/binman/etype/intel_descriptor.py
+++ b/tools/binman/etype/intel_descriptor.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for 'u-boot'
#
diff --git a/tools/binman/etype/intel_fsp.py b/tools/binman/etype/intel_fsp.py
index 13c9f05d941..827bd22ca07 100644
--- a/tools/binman/etype/intel_fsp.py
+++ b/tools/binman/etype/intel_fsp.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for Intel Firmware Support Package binary blob
#
diff --git a/tools/binman/etype/intel_me.py b/tools/binman/etype/intel_me.py
index 5e1c7993b7b..e02e4859877 100644
--- a/tools/binman/etype/intel_me.py
+++ b/tools/binman/etype/intel_me.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for Intel Management Engine binary blob
#
diff --git a/tools/binman/etype/intel_mrc.py b/tools/binman/etype/intel_mrc.py
index f6cedb70586..7c01b77a6f7 100644
--- a/tools/binman/etype/intel_mrc.py
+++ b/tools/binman/etype/intel_mrc.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for Intel Memory Reference Code binary blob
#
diff --git a/tools/binman/etype/intel_vbt.py b/tools/binman/etype/intel_vbt.py
index 29aedaffca9..4f082c3c2c9 100644
--- a/tools/binman/etype/intel_vbt.py
+++ b/tools/binman/etype/intel_vbt.py
@@ -1,8 +1,6 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for Intel Video BIOS Table binary blob
#
diff --git a/tools/binman/etype/intel_vga.py b/tools/binman/etype/intel_vga.py
index 6693607f98a..277fff15fdd 100644
--- a/tools/binman/etype/intel_vga.py
+++ b/tools/binman/etype/intel_vga.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for x86 VGA ROM binary blob
#
diff --git a/tools/binman/etype/u_boot.py b/tools/binman/etype/u_boot.py
index 1fcff733582..fc212d03009 100644
--- a/tools/binman/etype/u_boot.py
+++ b/tools/binman/etype/u_boot.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for U-Boot binary
#
diff --git a/tools/binman/etype/u_boot_dtb.py b/tools/binman/etype/u_boot_dtb.py
index 1122c958102..f6704db742b 100644
--- a/tools/binman/etype/u_boot_dtb.py
+++ b/tools/binman/etype/u_boot_dtb.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for U-Boot device tree
#
diff --git a/tools/binman/etype/u_boot_dtb_with_ucode.py b/tools/binman/etype/u_boot_dtb_with_ucode.py
index a384a759c4c..bedc39805df 100644
--- a/tools/binman/etype/u_boot_dtb_with_ucode.py
+++ b/tools/binman/etype/u_boot_dtb_with_ucode.py
@@ -1,7 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
-## Written by Simon Glass <sjg@chromium.org>
-
-# SPDX-License-Identifier: GPL-2.0+
+# Written by Simon Glass <sjg@chromium.org>
#
# Entry-type module for U-Boot device tree with the microcode removed
#
diff --git a/tools/binman/etype/u_boot_img.py b/tools/binman/etype/u_boot_img.py
index 744f1b471af..d5f1eb30570 100644
--- a/tools/binman/etype/u_boot_img.py
+++ b/tools/binman/etype/u_boot_img.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for U-Boot binary
#
diff --git a/tools/binman/etype/u_boot_nodtb.py b/tools/binman/etype/u_boot_nodtb.py
index 3721c3b997c..183b897bee6 100644
--- a/tools/binman/etype/u_boot_nodtb.py
+++ b/tools/binman/etype/u_boot_nodtb.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for 'u-boot-nodtb.bin'
#
diff --git a/tools/binman/etype/u_boot_spl.py b/tools/binman/etype/u_boot_spl.py
index 3720b47fef6..6a1c1234678 100644
--- a/tools/binman/etype/u_boot_spl.py
+++ b/tools/binman/etype/u_boot_spl.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for spl/u-boot-spl.bin
#
diff --git a/tools/binman/etype/u_boot_spl_bss_pad.py b/tools/binman/etype/u_boot_spl_bss_pad.py
index c37f61db235..d14122b4357 100644
--- a/tools/binman/etype/u_boot_spl_bss_pad.py
+++ b/tools/binman/etype/u_boot_spl_bss_pad.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for BSS padding for spl/u-boot-spl.bin. This padding
# can be added after the SPL binary to ensure that anything concatenated
# to it will appear to SPL to be at the end of BSS rather than the start.
diff --git a/tools/binman/etype/u_boot_spl_dtb.py b/tools/binman/etype/u_boot_spl_dtb.py
index 6c5ce1e996b..43d23778ecf 100644
--- a/tools/binman/etype/u_boot_spl_dtb.py
+++ b/tools/binman/etype/u_boot_spl_dtb.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for U-Boot device tree
#
diff --git a/tools/binman/etype/u_boot_spl_nodtb.py b/tools/binman/etype/u_boot_spl_nodtb.py
index 880e0c78fbc..5b058b4c721 100644
--- a/tools/binman/etype/u_boot_spl_nodtb.py
+++ b/tools/binman/etype/u_boot_spl_nodtb.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for 'u-boot-nodtb.bin'
#
diff --git a/tools/binman/etype/u_boot_spl_with_ucode_ptr.py b/tools/binman/etype/u_boot_spl_with_ucode_ptr.py
index 7b25ccb0488..1e3181a944c 100644
--- a/tools/binman/etype/u_boot_spl_with_ucode_ptr.py
+++ b/tools/binman/etype/u_boot_spl_with_ucode_ptr.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for an SPL binary with an embedded microcode pointer
#
diff --git a/tools/binman/etype/u_boot_ucode.py b/tools/binman/etype/u_boot_ucode.py
index f9f434d2cc2..10130a28114 100644
--- a/tools/binman/etype/u_boot_ucode.py
+++ b/tools/binman/etype/u_boot_ucode.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for a U-Boot binary with an embedded microcode pointer
#
diff --git a/tools/binman/etype/u_boot_with_ucode_ptr.py b/tools/binman/etype/u_boot_with_ucode_ptr.py
index 99b437130db..04b9f7cf7f8 100644
--- a/tools/binman/etype/u_boot_with_ucode_ptr.py
+++ b/tools/binman/etype/u_boot_with_ucode_ptr.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for a U-Boot binary with an embedded microcode pointer
#
diff --git a/tools/binman/etype/x86_start16.py b/tools/binman/etype/x86_start16.py
index a44ea68ac47..01e5b8bc38a 100644
--- a/tools/binman/etype/x86_start16.py
+++ b/tools/binman/etype/x86_start16.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for the 16-bit x86 start-up code for U-Boot
#
diff --git a/tools/binman/etype/x86_start16_spl.py b/tools/binman/etype/x86_start16_spl.py
index 3679a43437e..f0abbf038bd 100644
--- a/tools/binman/etype/x86_start16_spl.py
+++ b/tools/binman/etype/x86_start16_spl.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Entry-type module for the 16-bit x86 start-up code for U-Boot SPL
#
diff --git a/tools/binman/fdt_test.py b/tools/binman/fdt_test.py
index 249a9ea388e..8ea098f38ae 100644
--- a/tools/binman/fdt_test.py
+++ b/tools/binman/fdt_test.py
@@ -1,9 +1,7 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Test for the fdt modules
import os
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index b0832da08a4..a3abbc4b84b 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -1,9 +1,7 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# To run a single test, change to this directory, and:
#
# python -m unittest func_test.TestFunctional.testHelp
diff --git a/tools/binman/image.py b/tools/binman/image.py
index 741630f0912..b10b1887957 100644
--- a/tools/binman/image.py
+++ b/tools/binman/image.py
@@ -1,8 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2016 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Class for an image, the output of binman
#
diff --git a/tools/binman/image_test.py b/tools/binman/image_test.py
index 1b50dda4dca..44a5a2c010f 100644
--- a/tools/binman/image_test.py
+++ b/tools/binman/image_test.py
@@ -1,9 +1,7 @@
-#
+# SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2017 Google, Inc
# Written by Simon Glass <sjg@chromium.org>
#
-# SPDX-License-Identifier: GPL-2.0+
-#
# Test for the image module
import unittest
diff --git a/tools/binman/test/bss_data.c b/tools/binman/test/bss_data.c
index e0305c382c3..79537c31b65 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 6b2fe09d351..306dab50430 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 a9754769441..d8371610a5b 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 d3130cdeb31..29cf9d0e546 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 0b474b53747..849d158ac86 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 ee4c048b288..7224bc1863c 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 c4a2b85fc95..24cdb909d00 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 734d54f0d41..243c8e9e1a1 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 167debfe348..0cf9b762b5d 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")