diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-07 17:02:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-10 20:38:35 -0400 |
| commit | f739fcd831240dda10a92f4212f1854f8481aeee (patch) | |
| tree | 8b4badb5e666deef751ac9ee38d4bedabd5fe294 | |
| parent | b14619ba62dd55f581784f3e7d6416c92d831258 (diff) | |
| download | u-boot-f739fcd831240dda10a92f4212f1854f8481aeee.tar.gz u-boot-f739fcd831240dda10a92f4212f1854f8481aeee.tar.xz u-boot-f739fcd831240dda10a92f4212f1854f8481aeee.zip | |
SPDX: Convert a few files that were missed before
As part of the main conversion a few files were missed. These files had
additional whitespace after the '*' and before the SPDX tag and my
previous regex was too strict. This time I did a grep for all SPDX tags
and then filtered out anything that matched the correct styles.
Fixes: 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style")
Reported-by: Heinrich Schuchardt <xypron.debian@gmx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
52 files changed, 54 insertions, 106 deletions
diff --git a/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h b/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h index 463654efd3..ca8c5f3706 100644 --- a/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h +++ b/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2013,2014 Renesas Electronics Corporation * Copyright (C) 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __EHCI_RMOBILE_H__ diff --git a/arch/arm/mach-socfpga/qts-filter.sh b/arch/arm/mach-socfpga/qts-filter.sh index 02c28be2b7..3a442bc5d8 100755 --- a/arch/arm/mach-socfpga/qts-filter.sh +++ b/arch/arm/mach-socfpga/qts-filter.sh @@ -145,10 +145,10 @@ process_sdram_config() { ( cat << EOF +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA SDRAM configuration * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_SDRAM_CONFIG_H__ diff --git a/arch/arm/thumb1/include/asm/proc-armv/system.h b/arch/arm/thumb1/include/asm/proc-armv/system.h index 7dfbf3d33d..1324f7efb1 100644 --- a/arch/arm/thumb1/include/asm/proc-armv/system.h +++ b/arch/arm/thumb1/include/asm/proc-armv/system.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Thumb-1 drop-in for the linux/include/asm-arm/proc-armv/system.h * @@ -7,8 +8,6 @@ * The original file does not build in Thumb mode. However, in U-Boot * we don't use interrupt context, so we can redefine these as empty * memory barriers, which makes Thumb-1 compiler happy. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c index 3bd02f3c83..500dcce4da 100644 --- a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c +++ b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. * (c) Copyright 2017 Opal Kelly Inc. -* -* SPDX-License-Identifier: GPL-2.0+ *****************************************************************************/ #include <asm/arch/ps7_init_gpl.h> diff --git a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c index 5cf627d223..39afd82195 100644 --- a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c index fc325a6b02..88ff7947f2 100644 --- a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c index ca5490f0b0..e9e4e4d077 100644 --- a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c index 54c803cfa6..df7d3535dd 100644 --- a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 5498a5fccf..11b84c5528 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application loader * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <charset.h> diff --git a/doc/README.uefi b/doc/README.uefi index bb89b7ac2f..196e99994a 100644 --- a/doc/README.uefi +++ b/doc/README.uefi @@ -1,7 +1,7 @@ <!-- - Copyright (c) 2018 Heinrich Schuchardt +SPDX-License-Identifier: GPL-2.0+ - SPDX-License-Identifier: GPL-2.0+ +Copyright (c) 2018 Heinrich Schuchardt --> # UEFI on U-Boot diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c index 2388438d10..5d196cfb3f 100644 --- a/drivers/net/vsc9953.c +++ b/drivers/net/vsc9953.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 - 2015 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ - * * Driver for the Vitesse VSC9953 L2 Switch */ diff --git a/drivers/usb/host/ehci-rmobile.c b/drivers/usb/host/ehci-rmobile.c index 7fe79efc17..4868581066 100644 --- a/drivers/usb/host/ehci-rmobile.c +++ b/drivers/usb/host/ehci-rmobile.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * EHCI HCD (Host Controller Driver) for USB. * * Copyright (C) 2013,2014 Renesas Electronics Corporation * Copyright (C) 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/video/bridge/Makefile b/drivers/video/bridge/Makefile index 2a746c6f8b..45e54ac176 100644 --- a/drivers/video/bridge/Makefile +++ b/drivers/video/bridge/Makefile @@ -1,8 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Google, Inc # Written by Simon Glass <sjg@chromium.org> -# -# SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_VIDEO_BRIDGE) += video-bridge-uclass.o obj-$(CONFIG_VIDEO_BRIDGE_PARADE_PS862X) += ps862x.o diff --git a/include/asm-generic/pe.h b/include/asm-generic/pe.h index d1683f238a..9a8b5e82e3 100644 --- a/include/asm-generic/pe.h +++ b/include/asm-generic/pe.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Portable Executable and Common Object Constants * @@ -5,8 +6,6 @@ * * based on the "Microsoft Portable Executable and Common Object File Format * Specification", revision 11, 2017-01-23 - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_PE_H diff --git a/include/charset.h b/include/charset.h index 2662c2f7c9..11832cbd12 100644 --- a/include/charset.h +++ b/include/charset.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * charset conversion utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CHARSET_H_ diff --git a/include/efi_driver.h b/include/efi_driver.h index 010e55a473..840483a416 100644 --- a/include/efi_driver.h +++ b/include/efi_driver.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * EFI application loader * * Copyright (c) 2017 Heinrich Schuchardt - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EFI_DRIVER_H diff --git a/include/efi_loader.h b/include/efi_loader.h index 8d21ba74b1..2868ca25ab 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * EFI application loader * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EFI_LOADER_H diff --git a/include/efi_selftest.h b/include/efi_selftest.h index c23bc24bed..d0a76d70ca 100644 --- a/include/efi_selftest.h +++ b/include/efi_selftest.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * EFI application loader * * Copyright (c) 2017 Heinrich Schuchardt <xypron.glpk@gmx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EFI_SELFTEST_H diff --git a/include/net.h b/include/net.h index 3469811aa0..65f51d77a5 100644 --- a/include/net.h +++ b/include/net.h @@ -1,9 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * LiMon Monitor (LiMon) - Network. * * Copyright 1994 - 2000 Neil Russell. * (See License) - * SPDX-License-Identifier: GPL-2.0 * * History * 9/16/00 bor adapted to TQM823L/STK8xxL board, RARP/TFTP boot added diff --git a/include/pe.h b/include/pe.h index e7845bb7d2..d73eb142cb 100644 --- a/include/pe.h +++ b/include/pe.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Portable Executable binary format structures * * Copyright (c) 2016 Alexander Graf * * Based on wine code - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PE_H diff --git a/lib/charset.c b/lib/charset.c index 8cd17ea1cb..cd186a5a5a 100644 --- a/lib/charset.c +++ b/lib/charset.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * charset conversion utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <charset.h> diff --git a/lib/efi_driver/Makefile b/lib/efi_driver/Makefile index e35529a952..83baa1c9a4 100644 --- a/lib/efi_driver/Makefile +++ b/lib/efi_driver/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2017 Heinrich Schuchardt -# -# SPDX-License-Identifier: GPL-2.0+ -# # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index d9d2b14f61..9c807ff71d 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI block driver * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * The EFI uclass creates a handle for this driver and installs the * driver binding protocol on it. * diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index 46b69b479c..b484aba072 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Uclass for EFI drivers * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * For each EFI driver the uclass * - creates a handle * - installs the driver binding protocol diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 55c97c0476..c6046e36d2 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -1,8 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2016 Alexander Graf # -# SPDX-License-Identifier: GPL-2.0+ -# # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index c96b9d48c5..153e173757 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 1cfdabf6eb..5715a8b810 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application boot time services * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index 5d1a9a8081..d777db8a3e 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application console interface * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index a79e60a4ee..ca8037def2 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI device path interface * * Copyright (c) 2017 Heinrich Schuchardt - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c index 0ada2111db..94015329c8 100644 --- a/lib/efi_loader/efi_device_path_utilities.c +++ b/lib/efi_loader/efi_device_path_utilities.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI device path interface * * Copyright (c) 2017 Leif Lindholm - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 825a6d86de..5c6ec5258c 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application disk support * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index cec8347f55..e6a15bcb52 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 363ccbb789..1afe8418e1 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application disk support * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 2ccd476e57..e832cde901 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI image loader * * based partly on wine code * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 95f9ff0a14..664c651db5 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application memory management * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index e3132e6c17..e1139501d1 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application network access support * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 8558124c0a..52f1301d75 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application runtime services * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c index 62e9697902..482436e2ad 100644 --- a/lib/efi_loader/efi_smbios.c +++ b/lib/efi_loader/efi_smbios.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application tables support * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 6c177da3a6..7e0e7f020e 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <malloc.h> diff --git a/lib/efi_loader/efi_watchdog.c b/lib/efi_loader/efi_watchdog.c index d12e51da0a..6f69b76e4d 100644 --- a/lib/efi_loader/efi_watchdog.c +++ b/lib/efi_loader/efi_watchdog.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI watchdog * * Copyright (c) 2017 Heinrich Schuchardt - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index 0e4980c8a0..80c4302645 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -1,8 +1,6 @@ -: -# (C) Copyright 2017, Heinrich Schuchardt <xypron.glpk@gmx.de> -# -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0+ # +# (C) Copyright 2017, Heinrich Schuchardt <xypron.glpk@gmx.de> # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it diff --git a/lib/efi_selftest/efi_selftest_disk_image.h b/lib/efi_selftest/efi_selftest_disk_image.h index 9c741ce136..a0e0586608 100644 --- a/lib/efi_selftest/efi_selftest_disk_image.h +++ b/lib/efi_selftest/efi_selftest_disk_image.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Non-zero 8 byte strings of a disk image * * Generated with tools/file2include - * - * SPDX-License-Identifier: GPL-2.0+ */ #define EFI_ST_DISK_IMG { 0x00010000, { \ @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: BSD-2-Clause /* LZ4 - Fast LZ compression algorithm Copyright (C) 2011-2015, Yann Collet. - SPDX-License-Identifier: BSD-2-Clause - You can contact the author at : - LZ4 source repository : https://github.com/Cyan4973/lz4 - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd@denx.de - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd@denx.de - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ARP_H__ @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd@denx.de - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd@denx.de - * SPDX-License-Identifier: GPL-2.0 */ #if defined(CONFIG_CMD_CDP) @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd@denx.de - * SPDX-License-Identifier: GPL-2.0 */ /* diff --git a/net/ping.c b/net/ping.c index 9508cf1160..5464f2f785 100644 --- a/net/ping.c +++ b/net/ping.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd@denx.de - * SPDX-License-Identifier: GPL-2.0 */ #include "ping.h" diff --git a/net/ping.h b/net/ping.h index b672b95739..7b6f4e566d 100644 --- a/net/ping.h +++ b/net/ping.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd@denx.de - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __PING_H__ diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh index 20d5dd8a47..b6b9461a10 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -1,9 +1,7 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2014 Suriyan Ramasami -# -# SPDX-License-Identifier: GPL-2.0+ -# # Invoke this test script from U-Boot base directory as ./test/fs/fs-test.sh # It currently tests the fs/sb and native commands for ext4 and fat partitions diff --git a/tools/ifdtool.c b/tools/ifdtool.c index a576e2fce1..3a39b7bc70 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -757,7 +757,7 @@ static void print_version(void) { printf("ifdtool v%s -- ", IFDTOOL_VERSION); printf("Copyright (C) 2014 Google Inc.\n\n"); - printf("SPDX-License-Identifier: GPL-2.0+\n"); + printf("SPDX-License-Identifier: GPL-2.0+\n"); } static void print_usage(const char *name) |