diff options
Diffstat (limited to 'tools/binman')
44 files changed, 45 insertions, 96 deletions
diff --git a/tools/binman/README b/tools/binman/README index 7f558ec6a9..b20098177e 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 1c8e8dbff6..fa2f551f55 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 233d5e1d1a..e9e0434ab3 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 ffa2bbd80f..bc8ed8e37a 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 80ff2253f0..50085a3893 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 e5fc28258d..4abde121bd 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 caa523ebf8..6fa735ed59 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 1783098c01..b166a71c4a 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 def21640b5..10e59e980d 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 5541887d47..c331312c49 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 30676c8ad0..07cad2eecc 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 6435749e7c..4e0c85b92a 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 13c9f05d94..827bd22ca0 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 5e1c7993b7..e02e485987 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 f6cedb7058..7c01b77a6f 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 29aedaffca..4f082c3c2c 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 6693607f98..277fff15fd 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 1fcff73358..fc212d0300 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 1122c95810..f6704db742 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 a384a759c4..bedc39805d 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 744f1b471a..d5f1eb3057 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 3721c3b997..183b897bee 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 3720b47fef..6a1c123467 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 c37f61db23..d14122b435 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 6c5ce1e996..43d23778ec 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 880e0c78fb..5b058b4c72 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 7b25ccb048..1e3181a944 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 f9f434d2cc..10130a2811 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 99b437130d..04b9f7cf7f 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 a44ea68ac4..01e5b8bc38 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 3679a43437..f0abbf038b 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 249a9ea388..8ea098f38a 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 b0832da08a..a3abbc4b84 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 741630f091..b10b188795 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 1b50dda4dc..44a5a2c010 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 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") |