126 files changed, 126 insertions, 252 deletions
diff --git a/cmd/Makefile b/cmd/Makefile
index c4269ac8ac..9695309cc2 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2004-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 ifndef CONFIG_SPL_BUILD
 # core command
diff --git a/cmd/aes.c b/cmd/aes.c
index 23bc88038f..25efb9642a 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014 Marek Vasut <marex@denx.de>
  *
  * Command for en/de-crypting block of memory with AES-128-CBC cipher.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/armflash.c b/cmd/armflash.c
index b94d128faa..6872b0dde3 100644
--- a/cmd/armflash.c
+++ b/cmd/armflash.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015
  * Linus Walleij, Linaro
  *
  * Support for ARM Flash Partitions
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 #include <common.h>
 #include <command.h>
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 7bea9b7a2d..397dd1595b 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/binop.c b/cmd/binop.c
index 0002c66609..787f7a26ea 100644
--- a/cmd/binop.c
+++ b/cmd/binop.c
@@ -1,6 +1,4 @@
-/*
- * SPDX-License-Identifier:	GPL-2.0+
- */
+// SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
 #include <command.h>
diff --git a/cmd/blk_common.c b/cmd/blk_common.c
index 643fd0bfbc..cee25a0d41 100644
--- a/cmd/blk_common.c
+++ b/cmd/blk_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Handling of common block commands
  *
@@ -5,8 +6,6 @@
  *
  * (C) Copyright 2000-2011
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/blkcache.c b/cmd/blkcache.c
index d7afe3eff8..2cc65a9ee7 100644
--- a/cmd/blkcache.c
+++ b/cmd/blkcache.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) Nelson Integration, LLC 2016
  * Author: Eric Nelson<eric@nelint.com>
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  */
 #include <config.h>
 #include <common.h>
diff --git a/cmd/blob.c b/cmd/blob.c
index ae06ba70ae..d3b6e454bf 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *
  * Command for encapsulating/decapsulating blob of memory.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/bmp.c b/cmd/bmp.c
index fb6fe3f286..02bdf48b4d 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Detlev Zundel, DENX Software Engineering, dzu@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/boot.c b/cmd/boot.c
index 72f2cf362d..9150fce80b 100644
--- a/cmd/boot.c
+++ b/cmd/boot.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2003
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/booti.c b/cmd/booti.c
index f1e607ae0d..45fbb99b68 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/bootm.c b/cmd/bootm.c
index df0bbe19ca..c3a063474a 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 870db7c1de..21f353ffd3 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011-2013 Pali Rohár <pali.rohar@gmail.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index 788ab16436..ed0b0ff1fc 100644
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012, Google Inc. All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/bootz.c b/cmd/bootz.c
index ceff01bc04..0e75509ee9 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/btrfs.c b/cmd/btrfs.c
index 3f4f1b782b..faa1239cc8 100644
--- a/cmd/btrfs.c
+++ b/cmd/btrfs.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * 2017 by Marek Behun <marek.behun@nic.cz>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/cache.c b/cmd/cache.c
index 37ab345cb6..233f428054 100644
--- a/cmd/cache.c
+++ b/cmd/cache.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/cbfs.c b/cmd/cbfs.c
index 736f8c4527..ece790e56e 100644
--- a/cmd/cbfs.c
+++ b/cmd/cbfs.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/clk.c b/cmd/clk.c
index 52b25405ce..73fb25092b 100644
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013 Xilinx, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <command.h>
diff --git a/cmd/config.c b/cmd/config.c
index 0c7f4e06cd..fcc9116a49 100644
--- a/cmd/config.c
+++ b/cmd/config.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/console.c b/cmd/console.c
index 9a356ecfc3..3f1d98b17b 100644
--- a/cmd/console.c
+++ b/cmd/console.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/cpu.c b/cmd/cpu.c
index 6213c720cb..8c0abc1756 100644
--- a/cmd/cpu.c
+++ b/cmd/cpu.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2015 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
  * Copyright (c) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 86f1bac272..598028cfad 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -1,5 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * SPDX-License-Identifier:	GPL-2.0+
  *
  * based on: cmd_jffs2.c
  *
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index c1e2850887..60c87838fd 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Chromium OS cros_ec driver
  *
  * Copyright (c) 2016 The Chromium OS Authors.
  * Copyright (c) 2016 National Instruments Corp
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/dataflash_mmc_mux.c b/cmd/dataflash_mmc_mux.c
index 3832248cb6..9f271b6f61 100644
--- a/cmd/dataflash_mmc_mux.c
+++ b/cmd/dataflash_mmc_mux.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/date.c b/cmd/date.c
index 8714699621..1115b6c8d6 100644
--- a/cmd/date.c
+++ b/cmd/date.c
@@ -1,8 +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+
  */
 
 /*
diff --git a/cmd/demo.c b/cmd/demo.c
index bf14f7b1c5..52c6e7ec15 100644
--- a/cmd/demo.c
+++ b/cmd/demo.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2013 Google, Inc
  *
  * (C) Copyright 2012
  * Pavel Herrmann <morpheus.ibis@gmail.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/dfu.c b/cmd/dfu.c
index 68b1a7fec9..c9ba062197 100644
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cmd_dfu.c -- dfu command
  *
@@ -7,8 +8,6 @@
  * Copyright (C) 2012 Samsung Electronics
  * authors: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
  *	    Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/diag.c b/cmd/diag.c
index 14ae04f2a6..8d21c7dde8 100644
--- a/cmd/diag.c
+++ b/cmd/diag.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/disk.c b/cmd/disk.c
index 3d2a3d2204..dcc36a6c2c 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2011
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <command.h>
diff --git a/cmd/display.c b/cmd/display.c
index bc1b1ebb8f..fbe5514a70 100644
--- a/cmd/display.c
+++ b/cmd/display.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/echo.c b/cmd/echo.c
index 3dc3a63f6a..5b018d9349 100644
--- a/cmd/echo.c
+++ b/cmd/echo.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 7608be10f5..4052cf494a 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000, 2001
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/efi.c b/cmd/efi.c
index c76296e725..2511c6cb78 100644
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -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+
  */
 
 #include <common.h>
diff --git a/cmd/ethsw.c b/cmd/ethsw.c
index 92a60b4515..473324f878 100644
--- a/cmd/ethsw.c
+++ b/cmd/ethsw.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2015 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:      GPL-2.0+
- *
  * Ethernet Switch commands
  */
 
diff --git a/cmd/exit.c b/cmd/exit.c
index c7892333bb..f40d0686e1 100644
--- a/cmd/exit.c
+++ b/cmd/exit.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/ext2.c b/cmd/ext2.c
index 6657ef5ca4..dc56ab25ff 100644
--- a/cmd/ext2.c
+++ b/cmd/ext2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011 - 2012 Samsung Electronics
  * EXT4 filesystem implementation in Uboot by
@@ -13,8 +14,6 @@
  * (C) Copyright 2003 - 2004
  * Sysgo Real-Time Solutions, AG <www.elinos.com>
  * Pavel Bartusek <pba@sysgo.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/ext4.c b/cmd/ext4.c
index 19423d1c81..d2fa7f1db1 100644
--- a/cmd/ext4.c
+++ b/cmd/ext4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011 - 2012 Samsung Electronics
  * EXT4 filesystem implementation in Uboot by
@@ -16,8 +17,6 @@
  * (C) Copyright 2003 - 2004
  * Sysgo Real-Time Solutions, AG <www.elinos.com>
  * Pavel Bartusek <pba@sysgo.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index 8adcca592d..a5ec5f46f6 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2008 - 2009 Windriver, <www.windriver.com>
  * Author: Tom Rix <Tom.Rix@windriver.com>
  *
  * (C) Copyright 2014 Linaro, Ltd.
  * Rob Herring <robh@kernel.org>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <command.h>
diff --git a/cmd/fat.c b/cmd/fat.c
index ad1dc2a49f..03de5d11af 100644
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Richard Jones, rjones@nexus-tech.net
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/fdc.c b/cmd/fdc.c
index d2281abbda..906845d404 100644
--- a/cmd/fdc.c
+++ b/cmd/fdc.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG, d.peter@mpl.ch.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 /*
  * Floppy Disk support
diff --git a/cmd/fdt.c b/cmd/fdt.c
index 65661fabb2..28de467f96 100644
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007
  * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
  * Based on code written by:
  *   Pantelis Antoniou <pantelis.antoniou@gmail.com> and
  *   Matthew McClintock <msm@freescale.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/fitupd.c b/cmd/fitupd.c
index 78b8747336..1e5edd9f9b 100644
--- a/cmd/fitupd.c
+++ b/cmd/fitupd.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011
  * Andreas Pretzsch, carpe noctem engineering, apr@cn-eng.de
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/flash.c b/cmd/flash.c
index a2803e8ee4..cd1758d7e2 100644
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/fpga.c b/cmd/fpga.c
index ac6f504140..14ad4e5266 100644
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000, 2001
  * Rich Ireland, Enterasys Networks, rireland@enterasys.com.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/fpgad.c b/cmd/fpgad.c
index 5370c3e72d..0d55453eaa 100644
--- a/cmd/fpgad.c
+++ b/cmd/fpgad.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2013
  * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
@@ -5,8 +6,6 @@
  * based on cmd_mem.c
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/fs.c b/cmd/fs.c
index abfe5be172..8064a1c84d 100644
--- a/cmd/fs.c
+++ b/cmd/fs.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
  *
  * Inspired by cmd_ext_common.c, cmd_fat.c.
- *
- * SPDX-License-Identifier:	GPL-2.0
  */
 
 #include <common.h>
diff --git a/cmd/fs_uuid.c b/cmd/fs_uuid.c
index 613f3a4f3d..02ae9b7f3c 100644
--- a/cmd/fs_uuid.c
+++ b/cmd/fs_uuid.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cmd_fs_uuid.c -- fsuuid command
  *
  * Copyright (C) 2014, Bachmann electronic GmbH
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/fuse.c b/cmd/fuse.c
index 2917d83faf..42d74fa883 100644
--- a/cmd/fuse.c
+++ b/cmd/fuse.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009-2013 ADVANSEE
  * Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
@@ -5,8 +6,6 @@
  * Based on the mpc512x iim code:
  * Copyright 2008 Silicon Turnkey Express, Inc.
  * Martha Marx <mmarx@silicontkx.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/gettime.c b/cmd/gettime.c
index c48baad9a1..863bd87590 100644
--- a/cmd/gettime.c
+++ b/cmd/gettime.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
  *
@@ -5,8 +6,6 @@
  *
  * (C) Copyright 2001
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 707d861766..638870352f 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cmd_gpt.c -- GPT (GUID Partition Table) handling command
  *
@@ -7,8 +8,6 @@
  * Copyright (C) 2012 Samsung Electronics
  * author: Lukasz Majewski <l.majewski@samsung.com>
  * author: Piotr Wilczek <p.wilczek@samsung.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/hash.c b/cmd/hash.c
index 704d21ec6d..dff943ac9f 100644
--- a/cmd/hash.c
+++ b/cmd/hash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012 The Chromium OS Authors.
  *
@@ -6,8 +7,6 @@
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/help.c b/cmd/help.c
index 701ae7e905..503fa632e7 100644
--- a/cmd/help.c
+++ b/cmd/help.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/host.c b/cmd/host.c
index 080b7cfb1d..645dba4de8 100644
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012, Google Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/i2c.c b/cmd/i2c.c
index 8eca6fffaa..56df8eb3bc 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009
  * Sergey Kubushyn, himself, ksi@koi8.net
@@ -6,8 +7,6 @@
  *
  * (C) Copyright 2001
  * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/ide.c b/cmd/ide.c
index bdb598050c..1c58efc55a 100644
--- a/cmd/ide.c
+++ b/cmd/ide.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2011
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/ini.c b/cmd/ini.c
index 8656299447..8c28fa6394 100644
--- a/cmd/ini.c
+++ b/cmd/ini.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * inih -- simple .INI file parser
  *
@@ -6,8 +7,6 @@
  *              Joe Hershberger, National Instruments, joe.hershberger@ni.com
  * All rights reserved.
  *
- * SPDX-License-Identifier:	BSD-3-Clause
- *
  * Go to the project home page for more info:
  * http://code.google.com/p/inih/
  */
diff --git a/cmd/io.c b/cmd/io.c
index ad05f7ca5a..79faf814ff 100644
--- a/cmd/io.c
+++ b/cmd/io.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 /*
diff --git a/cmd/iotrace.c b/cmd/iotrace.c
index f54276d2f5..e496787e0d 100644
--- a/cmd/iotrace.c
+++ b/cmd/iotrace.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/irq.c b/cmd/irq.c
index 02da450f67..bcc718b4bc 100644
--- a/cmd/irq.c
+++ b/cmd/irq.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2008 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/itest.c b/cmd/itest.c
index 70db04a04f..fd6f4166f1 100644
--- a/cmd/itest.c
+++ b/cmd/itest.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2003
  * Tait Electronics Limited, Christchurch, New Zealand
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index 13c533cf12..64621f2546 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -17,8 +18,6 @@
  *
  *   $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
  *   Copyright 2002 SYSGO Real-Time Solutions GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/led.c b/cmd/led.c
index bdfb16c0e0..fc07ca95a3 100644
--- a/cmd/led.c
+++ b/cmd/led.c
@@ -1,8 +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+
  */
 
 #include <common.h>
diff --git a/cmd/legacy_led.c b/cmd/legacy_led.c
index 1ec2e43e50..7d40d8db58 100644
--- a/cmd/legacy_led.c
+++ b/cmd/legacy_led.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2010
  * Jason Kridner <jkridner@beagleboard.org>
@@ -6,8 +7,6 @@
  * http://www.mail-archive.com/u-boot@lists.denx.de/msg06873.html
  * (C) Copyright 2008
  * Ulf Samuelsson <ulf.samuelsson@atmel.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/license.c b/cmd/license.c
index 29fc8aa9a4..1c0794f095 100644
--- a/cmd/license.c
+++ b/cmd/license.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 by OpenMoko, Inc.
  * Author: Harald Welte <laforge@openmoko.org>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/load.c b/cmd/load.c
index 519c309a61..dd1e8dac13 100644
--- a/cmd/load.c
+++ b/cmd/load.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/log.c b/cmd/log.c
index 12bac0e03c..1e3936aeeb 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -1,8 +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+
  */
 
 #include <common.h>
diff --git a/cmd/lzmadec.c b/cmd/lzmadec.c
index 1b482edb58..6860b5f758 100644
--- a/cmd/lzmadec.c
+++ b/cmd/lzmadec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2013 Patrice Bouchand <pbfwdlist_gmail_com>
  * lzma uncompress command in Uboot
@@ -6,8 +7,6 @@
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/mac.c b/cmd/mac.c
index 4d0dd2b963..4227d10936 100644
--- a/cmd/mac.c
+++ b/cmd/mac.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2006 Freescale Semiconductor
  * York Sun (yorksun@freescale.com)
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/md5sum.c b/cmd/md5sum.c
index c737cb23b5..9d2d4180c5 100644
--- a/cmd/md5sum.c
+++ b/cmd/md5sum.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011
  * Joe Hershberger, National Instruments, joe.hershberger@ni.com
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/mdio.c b/cmd/mdio.c
index 3f11963006..184868063a 100644
--- a/cmd/mdio.c
+++ b/cmd/mdio.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011 Freescale Semiconductor, Inc
  * Andy Fleming
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/mem.c b/cmd/mem.c
index 6775ab7733..509b400b24 100644
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/mfsl.c b/cmd/mfsl.c
index e8e8e3c0de..583762a345 100644
--- a/cmd/mfsl.c
+++ b/cmd/mfsl.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 Michal Simek
  *
  * Michal  SIMEK <monstr@monstr.eu>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/mii.c b/cmd/mii.c
index 7ef7532a50..ce7b393eea 100644
--- a/cmd/mii.c
+++ b/cmd/mii.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/misc.c b/cmd/misc.c
index efcbb90d18..a1eef72a6c 100644
--- a/cmd/misc.c
+++ b/cmd/misc.c
@@ -1,8 +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+
  */
 
 /*
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 58fdc36f08..5a0b0f6607 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2003
  * Kyle Harris, kharris@nexus-tech.net
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/mp.c b/cmd/mp.c
index a80c642157..01d30c1ccb 100644
--- a/cmd/mp.c
+++ b/cmd/mp.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2008-2009 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 9bc977450c..c401009133 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -20,8 +21,6 @@
  *
  *   $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
  *   Copyright 2002 SYSGO Real-Time Solutions GmbH
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/mvebu/Makefile b/cmd/mvebu/Makefile
index 03de53ecdd..96829c48eb 100644
--- a/cmd/mvebu/Makefile
+++ b/cmd/mvebu/Makefile
@@ -1,7 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (C) 2016 Marvell International Ltd.
 #
-# SPDX-License-Identifier:	GPL-2.0
 # https://spdx.org/licenses
 
 
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 23fb8cd807..b4d371f305 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2016 Marvell International Ltd.
- *
- * SPDX-License-Identifier:	GPL-2.0
  * https://spdx.org/licenses
  */
 
diff --git a/cmd/net.c b/cmd/net.c
index 67888d4e18..f83839c35e 100644
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 9838678262..11489b0123 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2013
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -6,8 +7,6 @@
  * Andreas Heppel <aheppel@sysgo.de>
  *
  * Copyright 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/nvme.c b/cmd/nvme.c
index 63a8e5a0c2..5da903bd52 100644
--- a/cmd/nvme.c
+++ b/cmd/nvme.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 NXP Semiconductors
  * Copyright (C) 2017 Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/part.c b/cmd/part.c
index ec791fdc5d..bee204fff0 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
  *
@@ -12,8 +13,6 @@
  * (C) Copyright 2003 - 2004
  * Sysgo Real-Time Solutions, AG <www.elinos.com>
  * Pavel Bartusek <pba@sysgo.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/pci.c b/cmd/pci.c
index b8c799f9bd..2c5ee2a19d 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Andreas Heppel <aheppel@sysgo.de>
@@ -5,8 +6,6 @@
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  * Wolfgang Grandegger, DENX Software Engineering, wg@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/pcmcia.c b/cmd/pcmcia.c
index 0bf2bd654f..3b7537b105 100644
--- a/cmd/pcmcia.c
+++ b/cmd/pcmcia.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2006
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  ********************************************************************
  *
  * Lots of code copied from:
diff --git a/cmd/pmic.c b/cmd/pmic.c
index 7bf23fb2a9..f4b4a3f588 100644
--- a/cmd/pmic.c
+++ b/cmd/pmic.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014-2015 Samsung Electronics
  * Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <errno.h>
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 7043ad11fd..7649d92b6b 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2010-2011 Calxeda, Inc.
  * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/qfw.c b/cmd/qfw.c
index b38026ba81..7bf700538c 100644
--- a/cmd/qfw.c
+++ b/cmd/qfw.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015 Miao Yan <yanmiaobest@gmail.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/reginfo.c b/cmd/reginfo.c
index b23883e4bf..de94dd8071 100644
--- a/cmd/reginfo.c
+++ b/cmd/reginfo.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Subodh Nijsure, SkyStream Networks, snijsure@skystream.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/regulator.c b/cmd/regulator.c
index b605255180..89461b6ae8 100644
--- a/cmd/regulator.c
+++ b/cmd/regulator.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014-2015 Samsung Electronics
  * Przemyslaw Marczak <p.marczak@samsung.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <errno.h>
diff --git a/cmd/reiser.c b/cmd/reiser.c
index e10c7b9eba..2c0bca1c54 100644
--- a/cmd/reiser.c
+++ b/cmd/reiser.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2003 - 2004
  * Sysgo Real-Time Solutions, AG <www.elinos.com>
  * Pavel Bartusek <pba@sysgo.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c
index 794a406b78..9aebfc2f6e 100644
--- a/cmd/remoteproc.c
+++ b/cmd/remoteproc.c
@@ -1,7 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015
  * Texas Instruments Incorporated - http://www.ti.com/
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <command.h>
diff --git a/cmd/rockusb.c b/cmd/rockusb.c
index af81cdcd02..8206643b27 100644
--- a/cmd/rockusb.c
+++ b/cmd/rockusb.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Eddie Cai <eddie.cai.linux@gmail.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/sata.c b/cmd/sata.c
index 7817442532..cc12afb07e 100644
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2000-2005, DENX Software Engineering
  *		Wolfgang Denk <wd@denx.de>
@@ -6,8 +7,6 @@
  *			<mushtaqk_921@yahoo.co.in>
  * Copyright (C) 2008 Freescale Semiconductor, Inc.
  *		Dave Liu <daveliu@freescale.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/scsi.c b/cmd/scsi.c
index b9d086fb6b..67de1a3bdc 100644
--- a/cmd/scsi.c
+++ b/cmd/scsi.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index af210225f1..1a6cecdeda 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2008 Freescale Semiconductor, Inc.
  * Copyright 2013 Wolfgang Denk <wd@denx.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/sf.c b/cmd/sf.c
index e7ff9a6462..84bb0575f2 100644
--- a/cmd/sf.c
+++ b/cmd/sf.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Command for accessing SPI flash.
  *
  * Copyright (C) 2008 Atmel Corporation
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/sha1sum.c b/cmd/sha1sum.c
index 783ea2e32d..3c50fc27ce 100644
--- a/cmd/sha1sum.c
+++ b/cmd/sha1sum.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011
  * Joe Hershberger, National Instruments, joe.hershberger@ni.com
  *
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/sound.c b/cmd/sound.c
index f5dd8bcf26..d1cbc14f8d 100644
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012 Samsung Electronics
  * Rajeshwari Shinde <rajeshwari.s@samsung.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/source.c b/cmd/source.c
index a9831b6608..92481c4fff 100644
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Kyle Harris, kharris@nexus-tech.net
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/spi.c b/cmd/spi.c
index f16ef9a5db..9a2edcff65 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/spl.c b/cmd/spl.c
index 593989717f..038f48818d 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011
  * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/terminal.c b/cmd/terminal.c
index 4b9c0b34de..e1ec66ed71 100644
--- a/cmd/terminal.c
+++ b/cmd/terminal.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 OpenMoko, Inc.
  * Written by Harald Welte <laforge@openmoko.org>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/cmd/test.c b/cmd/test.c
index 7285f75469..fa0c349f08 100644
--- a/cmd/test.c
+++ b/cmd/test.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/thordown.c b/cmd/thordown.c
index 1bb5fc2ec2..e297de23a0 100644
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cmd_thordown.c -- USB TIZEN "THOR" Downloader gadget
  *
  * Copyright (C) 2013 Lukasz Majewski <l.majewski@samsung.com>
  * All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/ti/Makefile b/cmd/ti/Makefile
index 7dba66f4e7..16fbade9ed 100644
--- a/cmd/ti/Makefile
+++ b/cmd/ti/Makefile
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 obj- += dummy.o
 
diff --git a/cmd/ti/ddr3.c b/cmd/ti/ddr3.c
index 664bb5ff55..b82cbe152d 100644
--- a/cmd/ti/ddr3.c
+++ b/cmd/ti/ddr3.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * EMIF: DDR3 test commands
  *
  * Copyright (C) 2012-2017 Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <asm/arch/hardware.h>
diff --git a/cmd/time.c b/cmd/time.c
index 2cd8b1a577..51cde9749f 100644
--- a/cmd/time.c
+++ b/cmd/time.c
@@ -1,6 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/tpm.c b/cmd/tpm.c
index d9b433582c..c173bcfe42 100644
--- a/cmd/tpm.c
+++ b/cmd/tpm.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2013 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/tpm_test.c b/cmd/tpm_test.c
index 37ad2ff33d..2e7d133a47 100644
--- a/cmd/tpm_test.c
+++ b/cmd/tpm_test.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2015 Google, Inc
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/trace.c b/cmd/trace.c
index a0a7dd1995..26bf0960d4 100644
--- a/cmd/trace.c
+++ b/cmd/trace.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/tsi148.c b/cmd/tsi148.c
index ea96d0ffb0..369a2b5ab3 100644
--- a/cmd/tsi148.c
+++ b/cmd/tsi148.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2009 Reinhard Arlt, reinhard.arlt@esd-electronics.com
  *
  * base on universe.h by
  *
  * (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/ubifs.c b/cmd/ubifs.c
index 5e9d357cd7..11bab7a1a1 100644
--- a/cmd/ubifs.c
+++ b/cmd/ubifs.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2008
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 
diff --git a/cmd/universe.c b/cmd/universe.c
index c9310363f1..dc9a8b5617 100644
--- a/cmd/universe.c
+++ b/cmd/universe.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/unzip.c b/cmd/unzip.c
index 94f883f92a..f7aabf72d1 100644
--- a/cmd/unzip.c
+++ b/cmd/unzip.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/usb.c b/cmd/usb.c
index 907debe30f..0ccb1b5148 100644
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland
@@ -7,8 +8,6 @@
  *
  * Most of this source has been derived from the Linux USB
  * project.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index 97d00ec545..ba1f66a5de 100644
--- a/cmd/usb_gadget_sdp.c
+++ b/cmd/usb_gadget_sdp.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cmd_sdp.c -- sdp command
  *
  * Copyright (C) 2016 Toradex
  * Author: Stefan Agner <stefan.agner@toradex.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index cfeecb7068..89b9ddfbb9 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2011 Samsung Electronics
  * Lukasz Majewski <l.majewski@samsung.com>
  *
  * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <errno.h>
diff --git a/cmd/version.c b/cmd/version.c
index 15aab5dc18..b2fffe9977 100644
--- a/cmd/version.c
+++ b/cmd/version.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/x86/Makefile b/cmd/x86/Makefile
index d4c690b055..bcc6d06582 100644
--- a/cmd/x86/Makefile
+++ b/cmd/x86/Makefile
@@ -1,6 +1,4 @@
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
+# SPDX-License-Identifier: GPL-2.0+
 
 obj-y += mtrr.o
 obj-$(CONFIG_HAVE_FSP) += fsp.o
diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index 2a99cfe0d0..9f94ca9876 100644
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014-2015, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index f632f495ed..70f373a72a 100644
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014 Google, Inc
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/ximg.c b/cmd/ximg.c
index 069c6ad39a..6880c747f5 100644
--- a/cmd/ximg.c
+++ b/cmd/ximg.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2003
  * Kai-Uwe Bloem, Auerswald GmbH & Co KG, <linux-development@auerswald.de>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 
diff --git a/cmd/zfs.c b/cmd/zfs.c
index 6913043d7f..384ac4c939 100644
--- a/cmd/zfs.c
+++ b/cmd/zfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *
  * ZFS filesystem porting to Uboot by
@@ -5,8 +6,6 @@
  *
  * zfsfs support
  * made from existing GRUB Sources by Sun, GNU and others.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
diff --git a/cmd/zip.c b/cmd/zip.c
index dac7527721..d105d84e38 100644
--- a/cmd/zip.c
+++ b/cmd/zip.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2012
  * Lei Wen <leiwen@marvell.com>, Marvell Inc.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>