Browse Source

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>
Tom Rini 6 years ago
parent
commit
f739fcd831
52 changed files with 54 additions and 106 deletions
  1. 1 2
      arch/arm/mach-rmobile/include/mach/ehci-rmobile.h
  2. 1 1
      arch/arm/mach-socfpga/qts-filter.sh
  3. 1 2
      arch/arm/thumb1/include/asm/proc-armv/system.h
  4. 1 2
      board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c
  5. 1 4
      board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c
  6. 1 4
      board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c
  7. 1 4
      board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c
  8. 1 4
      board/xilinx/zynq/zynq-zed/ps7_init_gpl.c
  9. 1 2
      cmd/bootefi.c
  10. 2 2
      doc/README.uefi
  11. 1 2
      drivers/net/vsc9953.c
  12. 1 2
      drivers/usb/host/ehci-rmobile.c
  13. 1 2
      drivers/video/bridge/Makefile
  14. 1 2
      include/asm-generic/pe.h
  15. 1 2
      include/charset.h
  16. 1 2
      include/efi_driver.h
  17. 1 2
      include/efi_loader.h
  18. 1 2
      include/efi_selftest.h
  19. 1 1
      include/net.h
  20. 1 2
      include/pe.h
  21. 1 2
      lib/charset.c
  22. 1 3
      lib/efi_driver/Makefile
  23. 1 2
      lib/efi_driver/efi_block_device.c
  24. 1 2
      lib/efi_driver/efi_uclass.c
  25. 1 2
      lib/efi_loader/Makefile
  26. 1 2
      lib/efi_loader/efi_bootmgr.c
  27. 1 2
      lib/efi_loader/efi_boottime.c
  28. 1 2
      lib/efi_loader/efi_console.c
  29. 1 2
      lib/efi_loader/efi_device_path_to_text.c
  30. 1 2
      lib/efi_loader/efi_device_path_utilities.c
  31. 1 2
      lib/efi_loader/efi_disk.c
  32. 1 2
      lib/efi_loader/efi_file.c
  33. 1 2
      lib/efi_loader/efi_gop.c
  34. 1 2
      lib/efi_loader/efi_image_loader.c
  35. 1 2
      lib/efi_loader/efi_memory.c
  36. 1 2
      lib/efi_loader/efi_net.c
  37. 1 2
      lib/efi_loader/efi_runtime.c
  38. 1 2
      lib/efi_loader/efi_smbios.c
  39. 1 2
      lib/efi_loader/efi_variable.c
  40. 1 2
      lib/efi_loader/efi_watchdog.c
  41. 2 4
      lib/efi_selftest/Makefile
  42. 1 2
      lib/efi_selftest/efi_selftest_disk_image.h
  43. 1 2
      lib/lz4.c
  44. 1 1
      net/arp.c
  45. 1 1
      net/arp.h
  46. 1 1
      net/cdp.c
  47. 1 1
      net/cdp.h
  48. 1 1
      net/net.c
  49. 1 1
      net/ping.c
  50. 1 1
      net/ping.h
  51. 1 3
      test/fs/fs-test.sh
  52. 1 1
      tools/ifdtool.c

+ 1 - 2
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__

+ 1 - 1
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__

+ 1 - 2
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+
  */
 
 /*

+ 1 - 2
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>

+ 1 - 4
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+
-*
-*
 ******************************************************************************/
 /****************************************************************************/
 /**

+ 1 - 4
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+
-*
-*
 ******************************************************************************/
 /****************************************************************************/
 /**

+ 1 - 4
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+
-*
-*
 ******************************************************************************/
 /****************************************************************************/
 /**

+ 1 - 4
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+
-*
-*
 ******************************************************************************/
 /****************************************************************************/
 /**

+ 1 - 2
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>

+ 2 - 2
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

+ 1 - 2
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
  */
 

+ 1 - 2
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>

+ 1 - 2
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

+ 1 - 2
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

+ 1 - 2
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_

+ 1 - 2
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

+ 1 - 2
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

+ 1 - 2
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

+ 1 - 1
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

+ 1 - 2
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

+ 1 - 2
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>

+ 1 - 3
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

+ 1 - 2
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.
  *

+ 1 - 2
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

+ 1 - 2
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

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 1 - 2
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>

+ 2 - 4
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

+ 1 - 2
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 - 2
lib/lz4.c

@@ -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 - 1
net/arp.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 <common.h>

+ 1 - 1
net/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
  */
 
 #ifndef __ARP_H__

+ 1 - 1
net/cdp.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 <common.h>

+ 1 - 1
net/cdp.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 - 1
net/net.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
  */
 
 /*

+ 1 - 1
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"

+ 1 - 1
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__

+ 1 - 3
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

+ 1 - 1
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)