diff options
Diffstat (limited to 'tools')
174 files changed, 177 insertions, 372 deletions
diff --git a/tools/Makefile b/tools/Makefile index 8143c25666..1185bf5b36 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# # Enable all the config-independent tools ifneq ($(HOST_TOOLS_ALL),) diff --git a/tools/aisimage.c b/tools/aisimage.c index 9338342cb3..4cd76ab843 100644 --- a/tools/aisimage.c +++ b/tools/aisimage.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/aisimage.h b/tools/aisimage.h index e1aa3ef703..d8637a0fa5 100644 --- a/tools/aisimage.h +++ b/tools/aisimage.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2011 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _AISIMAGE_H_ diff --git a/tools/atmel_pmecc_params.c b/tools/atmel_pmecc_params.c index eb97229bbc..a4ae03f0fd 100644 --- a/tools/atmel_pmecc_params.c +++ b/tools/atmel_pmecc_params.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 Andreas Bießmann <andreas@biessmann.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/tools/atmelimage.c b/tools/atmelimage.c index 9b3600d62d..7b3b243d58 100644 --- a/tools/atmelimage.c +++ b/tools/atmelimage.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 * Andreas Bießmann <andreas@biessmann.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" 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") diff --git a/tools/buildman/README b/tools/buildman/README index aaee58152b..6c43c546f8 100644 --- a/tools/buildman/README +++ b/tools/buildman/README @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2013 The Chromium OS Authors. -# -# SPDX-License-Identifier: GPL-2.0+ -# (Please read 'How to change from MAKEALL' if you are used to that tool) diff --git a/tools/buildman/board.py b/tools/buildman/board.py index f842d3a1fa..272bac0c21 100644 --- a/tools/buildman/board.py +++ b/tools/buildman/board.py @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2012 The Chromium OS Authors. -# -# SPDX-License-Identifier: GPL-2.0+ -# import re diff --git a/tools/buildman/bsettings.py b/tools/buildman/bsettings.py index 892cfa09e2..03d7439aa5 100644 --- a/tools/buildman/bsettings.py +++ b/tools/buildman/bsettings.py @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2012 The Chromium OS Authors. -# -# SPDX-License-Identifier: GPL-2.0+ -# import ConfigParser import os diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 4e72b7d60d..2ccdee02a3 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -1,9 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2013 The Chromium OS Authors. # # Bloat-o-meter code used here Copyright 2004 Matt Mackall <mpm@selenic.com> # -# SPDX-License-Identifier: GPL-2.0+ -# import collections from datetime import datetime, timedelta diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 9ac101a5a4..fa9dec043a 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2014 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ -# import errno import glob diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py index 473117ccff..f17aa15e7c 100755 --- a/tools/buildman/buildman.py +++ b/tools/buildman/buildman.py @@ -1,9 +1,8 @@ #!/usr/bin/env python2 +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2012 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# """See README for more information""" diff --git a/tools/buildman/cmdline.py b/tools/buildman/cmdline.py index 6949d6bf2c..b8ddd4795c 100644 --- a/tools/buildman/cmdline.py +++ b/tools/buildman/cmdline.py @@ -1,8 +1,6 @@ -# +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2014 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ -# from optparse import OptionParser diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 3cac9f7cf6..c14b87842d 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2013 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import multiprocessing import os diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index eec0f9bd37..8d96c1a94d 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -1,8 +1,6 @@ -# +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2014 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ -# import os import shutil diff --git a/tools/buildman/kconfiglib.py b/tools/buildman/kconfiglib.py index 68b470a3a7..d68af056b6 100644 --- a/tools/buildman/kconfiglib.py +++ b/tools/buildman/kconfiglib.py @@ -1,5 +1,4 @@ -# -# SPDX-License-Identifier: ISC +# SPDX-License-Identifier: ISC # # Author: Ulf Magnusson # https://github.com/ulfalizer/Kconfiglib diff --git a/tools/buildman/test.py b/tools/buildman/test.py index e564a8a142..c36bcdf6fb 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -1,8 +1,6 @@ -# +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2012 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import os import shutil diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 2076323d5d..fb3157b2ea 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2012 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import re import glob diff --git a/tools/default_image.c b/tools/default_image.c index c67f66b255..4abff4543a 100644 --- a/tools/default_image.c +++ b/tools/default_image.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 Semihalf * @@ -10,8 +11,6 @@ * some functions added to address abstraction * * All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index c5767e5fb4..2f7302e529 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -1,10 +1,9 @@ #!/usr/bin/python +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2017 Google, Inc # Written by Simon Glass <sjg@chromium.org> # -# SPDX-License-Identifier: GPL-2.0+ -# """Device tree to platform data class diff --git a/tools/dtoc/dtoc.py b/tools/dtoc/dtoc.py index 6eacfc90a0..008c0f4d69 100755 --- a/tools/dtoc/dtoc.py +++ b/tools/dtoc/dtoc.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+ -# """Device tree to C tool diff --git a/tools/dtoc/dtoc_test.dts b/tools/dtoc/dtoc_test.dts index 1e86655975..b2259483a6 100644 --- a/tools/dtoc/dtoc_test.dts +++ b/tools/dtoc/dtoc_test.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_addr32.dts b/tools/dtoc/dtoc_test_addr32.dts index bcfdcae10b..239045497c 100644 --- a/tools/dtoc/dtoc_test_addr32.dts +++ b/tools/dtoc/dtoc_test_addr32.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_addr32_64.dts b/tools/dtoc/dtoc_test_addr32_64.dts index 1c96243310..7891ee59fa 100644 --- a/tools/dtoc/dtoc_test_addr32_64.dts +++ b/tools/dtoc/dtoc_test_addr32_64.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_addr64.dts b/tools/dtoc/dtoc_test_addr64.dts index 4c0ad0ec36..263d251386 100644 --- a/tools/dtoc/dtoc_test_addr64.dts +++ b/tools/dtoc/dtoc_test_addr64.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_addr64_32.dts b/tools/dtoc/dtoc_test_addr64_32.dts index c36f6b726e..759a7e8e26 100644 --- a/tools/dtoc/dtoc_test_addr64_32.dts +++ b/tools/dtoc/dtoc_test_addr64_32.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_aliases.dts b/tools/dtoc/dtoc_test_aliases.dts index c727f185af..e545816f4e 100644 --- a/tools/dtoc/dtoc_test_aliases.dts +++ b/tools/dtoc/dtoc_test_aliases.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_empty.dts b/tools/dtoc/dtoc_test_empty.dts index 1e86655975..b2259483a6 100644 --- a/tools/dtoc/dtoc_test_empty.dts +++ b/tools/dtoc/dtoc_test_empty.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_phandle.dts b/tools/dtoc/dtoc_test_phandle.dts index ba12b0fe65..91dfec5c63 100644 --- a/tools/dtoc/dtoc_test_phandle.dts +++ b/tools/dtoc/dtoc_test_phandle.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/dtoc_test_simple.dts b/tools/dtoc/dtoc_test_simple.dts index 6afe674b1f..895cc1fea2 100644 --- a/tools/dtoc/dtoc_test_simple.dts +++ b/tools/dtoc/dtoc_test_simple.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Test device tree file for dtoc * * Copyright 2017 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /dts-v1/; diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py index dbc338653b..7fab0cd8e9 100644 --- a/tools/dtoc/fdt.py +++ b/tools/dtoc/fdt.py @@ -1,10 +1,9 @@ #!/usr/bin/python +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016 Google, Inc # Written by Simon Glass <sjg@chromium.org> # -# SPDX-License-Identifier: GPL-2.0+ -# import struct import sys diff --git a/tools/dtoc/fdt_util.py b/tools/dtoc/fdt_util.py index ad06245b42..2d09649f72 100644 --- a/tools/dtoc/fdt_util.py +++ b/tools/dtoc/fdt_util.py @@ -1,10 +1,9 @@ #!/usr/bin/python +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2016 Google, Inc # Written by Simon Glass <sjg@chromium.org> # -# SPDX-License-Identifier: GPL-2.0+ -# import os import struct diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py index 0553b5cdf9..99f4e1a13a 100644 --- a/tools/dtoc/test_dtoc.py +++ b/tools/dtoc/test_dtoc.py @@ -1,8 +1,6 @@ -# +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2012 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# """Tests for the dtb_platdata module diff --git a/tools/dumpimage.c b/tools/dumpimage.c index 75a5d4762c..7115df04c1 100644 --- a/tools/dumpimage.c +++ b/tools/dumpimage.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Based on mkimage.c. * * Written by Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "dumpimage.h" diff --git a/tools/dumpimage.h b/tools/dumpimage.h index e415f14e14..e31d163292 100644 --- a/tools/dumpimage.h +++ b/tools/dumpimage.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Based on mkimage.c. * * Written by Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _DUMPIMAGE_H_ diff --git a/tools/easylogo/Makefile b/tools/easylogo/Makefile index 3c3e69f014..9278837f58 100644 --- a/tools/easylogo/Makefile +++ b/tools/easylogo/Makefile @@ -1,6 +1,4 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ hostprogs-y := easylogo diff --git a/tools/env/Makefile b/tools/env/Makefile index 95a03c98e7..4633e0e72b 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2002-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# # fw_printenv is supposed to run on the target system, which means it should be # built with cross tools. Although it may look weird, we only replace "HOSTCC" diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 77eac3d6c1..4b2caf6960 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * (C) Copyright 2008 * Guennadi Liakhovetski, DENX Software Engineering, lg@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #define _GNU_SOURCE diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index b86ca78ba2..b250e2f3d7 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdint.h> diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index fb4afa5ee9..26ba6624cd 100644 --- a/tools/env/fw_env_main.c +++ b/tools/env/fw_env_main.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/tools/env/fw_env_private.h b/tools/env/fw_env_private.h index 0c27da0b86..86be16dabc 100644 --- a/tools/env/fw_env_private.h +++ b/tools/env/fw_env_private.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2002-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Pull in the current config to define the default environment */ diff --git a/tools/envcrc.c b/tools/envcrc.c index e9fd088ff2..505949289f 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> diff --git a/tools/fdt_host.h b/tools/fdt_host.h index 98acf278a3..99b009b221 100644 --- a/tools/fdt_host.h +++ b/tools/fdt_host.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2008 Semihalf - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __FDT_HOST_H__ diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c index 8d33205ea2..f2b8b71ed7 100644 --- a/tools/fdtgrep.c +++ b/tools/fdtgrep.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013, Google Inc. * Written by Simon Glass <sjg@chromium.org> * - * SPDX-License-Identifier: GPL-2.0+ - * * Perform a grep of an FDT either displaying the source subset or producing * a new .dtb subset which can be used as required. */ diff --git a/tools/file2include.c b/tools/file2include.c index 9145f0845a..7ca45c8339 100644 --- a/tools/file2include.c +++ b/tools/file2include.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Convert a file image to a C define * * Copyright (c) 2017 Heinrich Schuchardt <xypron.glpk@gmx.de> * - * SPDX-License-Identifier: GPL-2.0+ - * * For testing EFI disk management we need an in memory image of * a disk. * diff --git a/tools/fit_check_sign.c b/tools/fit_check_sign.c index d9361b0095..62adc751cb 100644 --- a/tools/fit_check_sign.c +++ b/tools/fit_check_sign.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 * DENX Software Engineering @@ -15,8 +16,6 @@ * some functions added to address abstraction * * All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "mkimage.h" diff --git a/tools/fit_common.c b/tools/fit_common.c index 81ba698abd..d96085eaad 100644 --- a/tools/fit_common.c +++ b/tools/fit_common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 * DENX Software Engineering @@ -14,8 +15,6 @@ * some functions added to address abstraction * * All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/fit_common.h b/tools/fit_common.h index b8d8438717..71e792e3c4 100644 --- a/tools/fit_common.h +++ b/tools/fit_common.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2014 - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _FIT_COMMON_H_ diff --git a/tools/fit_image.c b/tools/fit_image.c index 3f5cc20e49..e55a8943e7 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 Semihalf * @@ -10,8 +11,6 @@ * some functions added to address abstraction * * All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/fit_info.c b/tools/fit_info.c index 652abcd2bd..45e0b310f7 100644 --- a/tools/fit_info.c +++ b/tools/fit_info.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 * DENX Software Engineering @@ -18,8 +19,6 @@ * some functions added to address abstraction * * All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "mkimage.h" diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile index 451332031e..24152dcc3c 100644 --- a/tools/gdb/Makefile +++ b/tools/gdb/Makefile @@ -1,12 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # # (C) Copyright 2000 # Murray Jensen <Murray.Jensen@csiro.au> -# -# SPDX-License-Identifier: GPL-2.0+ -# ifneq ($(HOSTOS),cygwin) diff --git a/tools/gdb/error.c b/tools/gdb/error.c index 4c32ce55f4..22a9b43e08 100644 --- a/tools/gdb/error.c +++ b/tools/gdb/error.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen@csiro.au> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdio.h> diff --git a/tools/gdb/error.h b/tools/gdb/error.h index fdadaacc6c..252e89f927 100644 --- a/tools/gdb/error.h +++ b/tools/gdb/error.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen@csiro.au> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdarg.h> diff --git a/tools/gdb/gdbcont.c b/tools/gdb/gdbcont.c index 761bdb0aae..9291a71749 100644 --- a/tools/gdb/gdbcont.c +++ b/tools/gdb/gdbcont.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen@csiro.au> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdio.h> diff --git a/tools/gdb/gdbsend.c b/tools/gdb/gdbsend.c index bb28c7214d..19c4dcb1d9 100644 --- a/tools/gdb/gdbsend.c +++ b/tools/gdb/gdbsend.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen@csiro.au> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdio.h> diff --git a/tools/gdb/remote.c b/tools/gdb/remote.c index f3681043f9..3cd0421351 100644 --- a/tools/gdb/remote.c +++ b/tools/gdb/remote.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * taken from gdb/remote.c * @@ -106,8 +107,6 @@ remote_continue(void) Free Software Foundation, Inc. This file is part of GDB. - - * SPDX-License-Identifier: GPL-2.0+ */ /* *INDENT-OFF* */ /* Remote communication protocol. diff --git a/tools/gdb/remote.h b/tools/gdb/remote.h index df6b06988b..2a68402b80 100644 --- a/tools/gdb/remote.h +++ b/tools/gdb/remote.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen@csiro.au> - * - * SPDX-License-Identifier: GPL-2.0+ */ extern int remote_desc, remote_timeout; diff --git a/tools/gdb/serial.c b/tools/gdb/serial.c index 709f8cef78..34ac609df1 100644 --- a/tools/gdb/serial.c +++ b/tools/gdb/serial.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen@csiro.au> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <unistd.h> diff --git a/tools/gdb/serial.h b/tools/gdb/serial.h index dc9d6b7e5d..c45d1dfd1a 100644 --- a/tools/gdb/serial.h +++ b/tools/gdb/serial.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2000 * Murray Jensen <Murray.Jensen@csiro.au> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <termios.h> diff --git a/tools/gen_eth_addr.c b/tools/gen_eth_addr.c index 5fa3e0cf56..ad36f3f0c2 100644 --- a/tools/gen_eth_addr.c +++ b/tools/gen_eth_addr.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2001 * Murray Jensen <Murray.Jensen@cmst.csiro.au> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdio.h> diff --git a/tools/gen_ethaddr_crc.c b/tools/gen_ethaddr_crc.c index 8cf86f4835..e73d0429a0 100644 --- a/tools/gen_ethaddr_crc.c +++ b/tools/gen_ethaddr_crc.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2016 * Olliver Schinagl <oliver@schinagl.nl> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <ctype.h> diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py index 2345a19798..0648472af0 100755 --- a/tools/genboardscfg.py +++ b/tools/genboardscfg.py @@ -1,9 +1,8 @@ #!/usr/bin/env python2 +# SPDX-License-Identifier: GPL-2.0+ # # Author: Masahiro Yamada <yamada.m@jp.panasonic.com> # -# SPDX-License-Identifier: GPL-2.0+ -# """ Converter from Kconfig and MAINTAINERS to a board database. diff --git a/tools/getline.c b/tools/getline.c index f7dbcc9bfe..64f1260099 100644 --- a/tools/getline.c +++ b/tools/getline.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* getline.c -- Replacement for GNU C library function getline * * Copyright (C) 1993, 1996, 2001, 2002 Free Software Foundation, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Written by Jan Brittenson, bson@gnu.ai.mit.edu. */ diff --git a/tools/gpheader.h b/tools/gpheader.h index 63a28a264d..d5bf86e589 100644 --- a/tools/gpheader.h +++ b/tools/gpheader.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2014 * Texas Instruments Incorporated @@ -15,8 +16,6 @@ * (C) Copyright 2008 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _GPIMAGE_H_ diff --git a/tools/gpimage-common.c b/tools/gpimage-common.c index 5ad52be437..fc6406b913 100644 --- a/tools/gpimage-common.c +++ b/tools/gpimage-common.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 * Texas Instruments Incorporated @@ -14,8 +15,6 @@ * (C) Copyright 2008 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/gpimage.c b/tools/gpimage.c index 1adc55c5fc..27de4cfaed 100644 --- a/tools/gpimage.c +++ b/tools/gpimage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2014 * Texas Instruments Incorporated @@ -15,8 +16,6 @@ * (C) Copyright 2008 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/ifdtool.c b/tools/ifdtool.c index e4c2f82c4a..a576e2fce1 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * ifdtool - Manage Intel Firmware Descriptor information * * Copyright 2014 Google, Inc * - * SPDX-License-Identifier: GPL-2.0 - * * From Coreboot project, but it got a serious code clean-up * and a few new features */ diff --git a/tools/ifdtool.h b/tools/ifdtool.h index 0d0cc3685e..bb70b2f710 100644 --- a/tools/ifdtool.h +++ b/tools/ifdtool.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * ifdtool - Manage Intel Firmware Descriptor information * * Copyright (C) 2011 The ChromiumOS Authors. * - * SPDX-License-Identifier: GPL-2.0 - * * From Coreboot project */ diff --git a/tools/image-host.c b/tools/image-host.c index 8a7469e538..8e43671714 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013, Google Inc. * @@ -5,8 +6,6 @@ * * (C) Copyright 2000-2006 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "mkimage.h" diff --git a/tools/imagetool.c b/tools/imagetool.c index 855a096d0a..a4e39b24bc 100644 --- a/tools/imagetool.c +++ b/tools/imagetool.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2013 * * Written by Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/imagetool.h b/tools/imagetool.h index e67de9b5ad..ef2429e050 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2013 * * Written by Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _IMAGETOOL_H_ diff --git a/tools/imximage.c b/tools/imximage.c index 14f80154d0..5f63bf8759 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. @@ -5,8 +6,6 @@ * (C) Copyright 2008 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/kermit/README b/tools/kermit/README index c3b491aa55..2b3f0b5cd4 100644 --- a/tools/kermit/README +++ b/tools/kermit/README @@ -1,9 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2001 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# This directory contains scripts that help to perform certain actions that need to be done frequently when working with U-Boot. diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 26686ad30f..a88a3830c0 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Image manipulator for Marvell SoCs * supports Kirkwood, Dove, Armada 370, Armada XP, and Armada 38x @@ -5,8 +6,6 @@ * (C) Copyright 2013 Thomas Petazzoni * <thomas.petazzoni@free-electrons.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * Not implemented: support for the register headers in v1 images */ diff --git a/tools/kwbimage.h b/tools/kwbimage.h index 2160c8f997..25bc08c5ce 100644 --- a/tools/kwbimage.h +++ b/tools/kwbimage.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2008 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _KWBIMAGE_H_ diff --git a/tools/lpc32xximage.c b/tools/lpc32xximage.c index 6b3865f642..37931f9184 100644 --- a/tools/lpc32xximage.c +++ b/tools/lpc32xximage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Image manipulator for LPC32XX SoCs * @@ -17,8 +18,6 @@ * (C) Copyright 2008 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/microcode-tool.py b/tools/microcode-tool.py index 069d961d80..249a33b8ca 100755 --- a/tools/microcode-tool.py +++ b/tools/microcode-tool.py @@ -1,9 +1,8 @@ #!/usr/bin/env python2 +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2014 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ -# # Intel microcode update tool from optparse import OptionParser diff --git a/tools/mingw_support.c b/tools/mingw_support.c index 95c4db8923..2b17bf7dd2 100644 --- a/tools/mingw_support.c +++ b/tools/mingw_support.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2008 Extreme Engineering Solutions, Inc. * @@ -5,8 +6,6 @@ * Clamav Native Windows Port : mmap win32 compatibility layer * Copyright (c) 2005-2006 Gianluigi Tiesi <sherpya@netfarm.it> * Parts by Kees Zeelenberg <kzlg@users.sourceforge.net> (LibGW32C) - * - * SPDX-License-Identifier: LGPL-2.0+ */ #include "mingw_support.h" @@ -71,8 +70,6 @@ int munmap(void *addr, size_t len) /* Reentrant string tokenizer. Generic version. Copyright (C) 1991,1996-1999,2001,2004,2007 Free Software Foundation, Inc. This file is part of the GNU C Library. - - * SPDX-License-Identifier: GPL-2.0+ */ /* Parse S into tokens separated by characters in DELIM. diff --git a/tools/mingw_support.h b/tools/mingw_support.h index f9535b3768..e0b8ac3ebc 100644 --- a/tools/mingw_support.h +++ b/tools/mingw_support.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: LGPL-2.0+ */ /* * Copyright 2008 Extreme Engineering Solutions, Inc. - * - * SPDX-License-Identifier: LGPL-2.0+ */ #ifndef __MINGW_SUPPORT_H_ diff --git a/tools/mips-relocs.c b/tools/mips-relocs.c index 27d47308e0..442cc8f6d2 100644 --- a/tools/mips-relocs.c +++ b/tools/mips-relocs.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * MIPS Relocation Data Generator * * Copyright (c) 2017 Imagination Technologies Ltd. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <assert.h> diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 8cd9ffa1c6..75967d0c2d 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 Free Electrons * David Wagner <david.wagner@free-electrons.com> @@ -5,8 +6,6 @@ * Inspired from envcrc.c: * (C) Copyright 2001 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <errno.h> diff --git a/tools/mkexynosspl.c b/tools/mkexynosspl.c index 46195aad55..53122b8614 100644 --- a/tools/mkexynosspl.c +++ b/tools/mkexynosspl.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2012 Samsung Electronics - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdio.h> diff --git a/tools/mkimage.c b/tools/mkimage.c index 32e07be94a..64ad131860 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2008 Semihalf * * (C) Copyright 2000-2009 * DENX Software Engineering * Wolfgang Denk, wd@denx.de - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "mkimage.h" diff --git a/tools/mkimage.h b/tools/mkimage.h index baee866665..0254af59fb 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2000-2004 * DENX Software Engineering * Wolfgang Denk, wd@denx.de - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _MKIIMAGE_H_ diff --git a/tools/mksunxiboot.c b/tools/mksunxiboot.c index db0f10ec29..1c8701e75e 100644 --- a/tools/mksunxiboot.c +++ b/tools/mksunxiboot.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007-2011 * Allwinner Technology Co., Ltd. <www.allwinnertech.com> * Tom Cubie <tangliang@allwinnertech.com> * * a simple tool to generate bootable image for sunxi platform. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <fcntl.h> #include <stdio.h> diff --git a/tools/moveconfig.py b/tools/moveconfig.py index bdd4899fcd..caa81ac2ed 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -1,9 +1,8 @@ #!/usr/bin/env python2 +# SPDX-License-Identifier: GPL-2.0+ # # Author: Masahiro Yamada <yamada.masahiro@socionext.com> # -# SPDX-License-Identifier: GPL-2.0+ -# """ Move config options from headers to defconfig files. diff --git a/tools/mrvl_uart.sh b/tools/mrvl_uart.sh index 6824208902..a46411fc99 100755 --- a/tools/mrvl_uart.sh +++ b/tools/mrvl_uart.sh @@ -1,9 +1,9 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0 # ###################################################### # Copyright (C) 2016 Marvell International Ltd. # -# SPDX-License-Identifier: GPL-2.0 # https://spdx.org/licenses # # Author: Konstantin Porotchkin kostap@marvell.com diff --git a/tools/mxsboot.c b/tools/mxsboot.c index 2e72009576..04d86f87a8 100644 --- a/tools/mxsboot.c +++ b/tools/mxsboot.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Freescale i.MX28 image generator * * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com> * on behalf of DENX Software Engineering GmbH - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <fcntl.h> diff --git a/tools/mxsimage.c b/tools/mxsimage.c index c8f1f204e3..0bb5c6aa6b 100644 --- a/tools/mxsimage.c +++ b/tools/mxsimage.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Freescale i.MX23/i.MX28 SB image generator * * Copyright (C) 2012-2013 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifdef CONFIG_MXS diff --git a/tools/mxsimage.h b/tools/mxsimage.h index 88f72eb9d1..a6a45a4b03 100644 --- a/tools/mxsimage.h +++ b/tools/mxsimage.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Freescale i.MX28 SB image generator * * Copyright (C) 2012 Marek Vasut <marex@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MXSSB_H__ diff --git a/tools/omap/clocks_get_m_n.c b/tools/omap/clocks_get_m_n.c index 57e25753a2..e21b0e2b60 100644 --- a/tools/omap/clocks_get_m_n.c +++ b/tools/omap/clocks_get_m_n.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Program for finding M & N values for DPLLs * To be run on Host PC @@ -6,8 +7,6 @@ * Texas Instruments, <www.ti.com> * * Aneesh V <aneesh@ti.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <stdlib.h> #include <stdio.h> diff --git a/tools/omapimage.c b/tools/omapimage.c index 01e02649e1..c59cdcc79b 100644 --- a/tools/omapimage.c +++ b/tools/omapimage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2010 * Linaro LTD, www.linaro.org @@ -10,8 +11,6 @@ * (C) Copyright 2008 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/omapimage.h b/tools/omapimage.h index 8744ae7a2d..175fac2da6 100644 --- a/tools/omapimage.h +++ b/tools/omapimage.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2010 * Linaro LTD, www.linaro.org * Author John Rigby <john.rigby@linaro.org> * Based on TI's signGP.c - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _OMAPIMAGE_H_ diff --git a/tools/os_support.c b/tools/os_support.c index f7651d0e1f..21e43c876a 100644 --- a/tools/os_support.c +++ b/tools/os_support.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2009 Extreme Engineering Solutions, Inc. - * - * SPDX-License-Identifier: LGPL-2.0+ */ /* diff --git a/tools/os_support.h b/tools/os_support.h index 695ffcfe79..3a2106ed7e 100644 --- a/tools/os_support.h +++ b/tools/os_support.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: LGPL-2.0+ */ /* * Copyright 2009 Extreme Engineering Solutions, Inc. - * - * SPDX-License-Identifier: LGPL-2.0+ */ #ifndef __OS_SUPPORT_H_ diff --git a/tools/patman/README b/tools/patman/README index 8582ed6ba1..606780e2ed 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -1,7 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. -# -# SPDX-License-Identifier: GPL-2.0+ -# What is this? ============= diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py index 2915d97950..d47ea438b7 100644 --- a/tools/patman/checkpatch.py +++ b/tools/patman/checkpatch.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import collections import command diff --git a/tools/patman/command.py b/tools/patman/command.py index bebc495b59..598bfdcd90 100644 --- a/tools/patman/command.py +++ b/tools/patman/command.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import os import cros_subprocess diff --git a/tools/patman/commit.py b/tools/patman/commit.py index 3e0adb8f7e..2bf3a0ba5b 100644 --- a/tools/patman/commit.py +++ b/tools/patman/commit.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import re diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py index 2c0da84b30..85372f3c0a 100644 --- a/tools/patman/func_test.py +++ b/tools/patman/func_test.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- +# SPDX-License-Identifier: GPL-2.0+ # # Copyright 2017 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ -# import contextlib import os diff --git a/tools/patman/get_maintainer.py b/tools/patman/get_maintainer.py index 22b091808a..0ffb55a821 100644 --- a/tools/patman/get_maintainer.py +++ b/tools/patman/get_maintainer.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2012 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import command import gitutil diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 08be9377ce..64ac0c8d3d 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import command import re diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 1b9136aa5c..b6455b0fa3 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import math import os diff --git a/tools/patman/patman.py b/tools/patman/patman.py index 7647440be5..8d2c78235a 100755 --- a/tools/patman/patman.py +++ b/tools/patman/patman.py @@ -1,9 +1,8 @@ #!/usr/bin/env python2 +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# """See README for more information""" diff --git a/tools/patman/project.py b/tools/patman/project.py index e05ff1163f..1d9cfc0625 100644 --- a/tools/patman/project.py +++ b/tools/patman/project.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2012 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import os.path diff --git a/tools/patman/series.py b/tools/patman/series.py index 73ee394486..d526d4ee91 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# from __future__ import print_function diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 92379b72e7..94ea5b5a1b 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# from __future__ import print_function diff --git a/tools/patman/setup.py b/tools/patman/setup.py index e61804f178..43fdc00ce6 100644 --- a/tools/patman/setup.py +++ b/tools/patman/setup.py @@ -1,6 +1,5 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# +# SPDX-License-Identifier: GPL-2.0+ + from distutils.core import setup setup(name='patman', version='1.0', diff --git a/tools/patman/terminal.py b/tools/patman/terminal.py index 137265fc81..4ceab189bf 100644 --- a/tools/patman/terminal.py +++ b/tools/patman/terminal.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# """Terminal utilities diff --git a/tools/patman/test.py b/tools/patman/test.py index 51145e8390..343efc99bd 100644 --- a/tools/patman/test.py +++ b/tools/patman/test.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2011 The Chromium OS Authors. # -# SPDX-License-Identifier: GPL-2.0+ -# import os import tempfile @@ -149,10 +148,10 @@ index 0000000..2234c87 --- /dev/null +++ b/common/bootstage.c @@ -0,0 +1,37 @@ ++/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2011, Google Inc. All rights reserved. + * -+ * SPDX-License-Identifier: GPL-2.0+ + */ + +/* diff --git a/tools/patman/tools.py b/tools/patman/tools.py index ba24853030..700cb4505d 100644 --- a/tools/patman/tools.py +++ b/tools/patman/tools.py @@ -1,8 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (c) 2016 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ -# import os import shutil diff --git a/tools/patman/tout.py b/tools/patman/tout.py index c5fbd80dbc..4cd49e1c68 100644 --- a/tools/patman/tout.py +++ b/tools/patman/tout.py @@ -1,7 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # Copyright (c) 2016 Google, Inc # -# SPDX-License-Identifier: GPL-2.0+ -# # Terminal output logging. # diff --git a/tools/pbl_crc32.c b/tools/pbl_crc32.c index 6e6735acde..06da1d92ff 100644 --- a/tools/pbl_crc32.c +++ b/tools/pbl_crc32.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2012 Freescale Semiconductor, Inc. * * Cleaned up and refactored by Charles Manning. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "pblimage.h" diff --git a/tools/pbl_crc32.h b/tools/pbl_crc32.h index 4ab55ee768..4320a47d4c 100644 --- a/tools/pbl_crc32.h +++ b/tools/pbl_crc32.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2012 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef PBLCRC32_H diff --git a/tools/pblimage.c b/tools/pblimage.c index d25a733d41..d11f9afe24 100644 --- a/tools/pblimage.c +++ b/tools/pblimage.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2012-2014 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" #include <image.h> diff --git a/tools/pblimage.h b/tools/pblimage.h index 12bece50a7..81c5492926 100644 --- a/tools/pblimage.h +++ b/tools/pblimage.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2012 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef PBLIMAGE_H diff --git a/tools/prelink-riscv.c b/tools/prelink-riscv.c index 632d2da6ba..52eb78e9d0 100644 --- a/tools/prelink-riscv.c +++ b/tools/prelink-riscv.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Andes Technology * Chih-Mao Chen <cmchen@andestech.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * Statically process runtime relocations on RISC-V ELF images * so that it can be directly executed when loaded at LMA * without fixup. Both RV32 and RV64 are supported. diff --git a/tools/prelink-riscv.inc b/tools/prelink-riscv.inc index c07d930f7e..d49258707d 100644 --- a/tools/prelink-riscv.inc +++ b/tools/prelink-riscv.inc @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2017 Andes Technology * Chih-Mao Chen <cmchen@andestech.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * Statically process runtime relocations on RISC-V ELF images * so that it can be directly executed when loaded at LMA * without fixup. Both RV32 and RV64 are supported. diff --git a/tools/proftool.c b/tools/proftool.c index ddf870f66e..c1803fa78a 100644 --- a/tools/proftool.c +++ b/tools/proftool.c @@ -1,7 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (c) 2013 Google, Inc - * - * SPDX-License-Identifier: GPL-2.0+ */ /* Decode and dump U-Boot profiling information */ diff --git a/tools/rkcommon.c b/tools/rkcommon.c index aed2b95fd6..831c2ad820 100644 --- a/tools/rkcommon.c +++ b/tools/rkcommon.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> * * (C) 2017 Theobroma Systems Design und Consulting GmbH * - * SPDX-License-Identifier: GPL-2.0+ - * * Helper functions for Rockchip images */ diff --git a/tools/rkcommon.h b/tools/rkcommon.h index 8790f1ceab..47f47a52aa 100644 --- a/tools/rkcommon.h +++ b/tools/rkcommon.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _RKCOMMON_H diff --git a/tools/rkimage.c b/tools/rkimage.c index 9880b1569f..a0a3185370 100644 --- a/tools/rkimage.c +++ b/tools/rkimage.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> * - * SPDX-License-Identifier: GPL-2.0+ - * * See README.rockchip for details of the rkimage format */ diff --git a/tools/rksd.c b/tools/rksd.c index c56153d2ca..24411d863a 100644 --- a/tools/rksd.c +++ b/tools/rksd.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> * - * SPDX-License-Identifier: GPL-2.0+ - * * See README.rockchip for details of the rksd format */ diff --git a/tools/rkspi.c b/tools/rkspi.c index 4332ce1765..faa18fcd18 100644 --- a/tools/rkspi.c +++ b/tools/rkspi.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2015 Google, Inc * Written by Simon Glass <sjg@chromium.org> * - * SPDX-License-Identifier: GPL-2.0+ - * * See README.rockchip for details of the rkspi format */ diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c index 8fe91fe80e..7f83b50761 100644 --- a/tools/socfpgaimage.c +++ b/tools/socfpgaimage.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014 Charles Manning <cdhmanning@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * Reference doc http://www.altera.com.cn/literature/hb/cyclone-v/cv_5400A.pdf * Note this doc is not entirely accurate. Of particular interest to us is the * "header" length field being in U32s and not bytes. diff --git a/tools/ublimage.c b/tools/ublimage.c index 6ed1eef29c..1d2e897f6b 100644 --- a/tools/ublimage.c +++ b/tools/ublimage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. @@ -9,8 +10,6 @@ * (C) Copyright 2008 * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/ublimage.h b/tools/ublimage.h index 32cc5822ca..65d6aa1ff0 100644 --- a/tools/ublimage.h +++ b/tools/ublimage.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. @@ -5,8 +6,6 @@ * Vased on: * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _UBLIMAGE_H_ diff --git a/tools/ubsha1.c b/tools/ubsha1.c index 4a17246da7..90a6f3f59d 100644 --- a/tools/ubsha1.c +++ b/tools/ubsha1.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * (C) Copyright 2007 * Heiko Schocher, DENX Software Engineering, <hs@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "os_support.h" diff --git a/tools/vybridimage.c b/tools/vybridimage.c index a31fc1099c..94a6684c19 100644 --- a/tools/vybridimage.c +++ b/tools/vybridimage.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Image manipulator for Vybrid SoCs * @@ -5,8 +6,6 @@ * * (C) Copyright 2016 DENX Software Engineering GmbH * Written-by: Albert ARIBAUD <albert.aribaud@3adev.fr> - * - * SPDX-License-Identifier: GPL-2.0+ */ #include "imagetool.h" diff --git a/tools/zynqimage.c b/tools/zynqimage.c index aa003a7543..d3f418b061 100644 --- a/tools/zynqimage.c +++ b/tools/zynqimage.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Nathan Rossi <nathan@nathanrossi.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * The following Boot Header format/structures and values are defined in the * following documents: * * Xilinx Zynq-7000 Technical Reference Manual (Section 6.3) diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c index a61fb17c40..421558d46e 100644 --- a/tools/zynqmpimage.c +++ b/tools/zynqmpimage.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Michal Simek <michals@xilinx.com> * Copyright (C) 2015 Nathan Rossi <nathan@nathanrossi.com> * - * SPDX-License-Identifier: GPL-2.0+ - * * The following Boot Header format/structures and values are defined in the * following documents: * * ug1085 ZynqMP TRM doc v1.4 (Chapter 11, Table 11-4) |