diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-06 17:58:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 09:34:12 -0400 |
| commit | 83d290c56fab2d38cd1ab4c4cc7099559c1d5046 (patch) | |
| tree | 5e5d1b40b52aaf96b707e0da2474573306d22f7b /tools/binman/etype | |
| parent | 7ce85318cfff5fd82a059131761559cba7fef309 (diff) | |
| download | u-boot-83d290c56fab2d38cd1ab4c4cc7099559c1d5046.tar.gz | |
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/etype')
24 files changed, 25 insertions, 50 deletions
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 # |