Merge branch 'for-next/misc'

115 files changed, 365 insertions, 1809 deletions

diff --git a/commands/2048.c b/commands/2048.c
index 865803a5a6..3ad9c0f3ae 100644
--- a/commands/2048.c
+++ b/commands/2048.c
@@ -1,31 +1,7 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2014 Maurits van der Schee
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *
- * ============================================================================
- * Name        : 2048.c
- * Author      : Maurits van der Schee
- * Description : Console version of the game "2048" for GNU/Linux
- * ============================================================================
- */
+// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: © 2014 Maurits van der Schee
+
+/* Console version of the game "2048" for GNU/Linux */
 
 #include <common.h>
 #include <readkey.h>
diff --git a/commands/automount.c b/commands/automount.c
index a71430c9ef..d2b3a2d56e 100644
--- a/commands/automount.c
+++ b/commands/automount.c
@@ -1,20 +1,8 @@
-/*
- * automount.c - automount devices
- *
- * Copyright (c) 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* automount.c - automount devices */
+
 #include <common.h>
 #include <command.h>
 #include <fs.h>
diff --git a/commands/barebox-update.c b/commands/barebox-update.c
index 53af2a8511..4b23433e84 100644
--- a/commands/barebox-update.c
+++ b/commands/barebox-update.c
@@ -1,20 +1,8 @@
-/*
- * barebox-update.c - update barebox
- *
- * Copyright (c) 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* barebox-update.c - update barebox */
+
 #include <common.h>
 #include <command.h>
 #include <libfile.h>
diff --git a/commands/basename.c b/commands/basename.c
index c1a28e9e1d..7dd9ba2a7a 100644
--- a/commands/basename.c
+++ b/commands/basename.c
@@ -1,21 +1,7 @@
-/*
- * basename.c - strip directory and suffix from filenames
- *
- * Copyright (c) 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* basename.c - strip directory and suffix from filenames */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/blobgen.c b/commands/blobgen.c
index 49107d037c..8ff2cc2c11 100644
--- a/commands/blobgen.c
+++ b/commands/blobgen.c
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
+
 #include <common.h>
 #include <command.h>
 #include <getopt.h>
diff --git a/commands/boot.c b/commands/boot.c
index aaa20faae9..ad2d83a179 100644
--- a/commands/boot.c
+++ b/commands/boot.c
@@ -1,15 +1,4 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <globalvar.h>
 #include <command.h>
diff --git a/commands/bootchooser.c b/commands/bootchooser.c
index ac763a6553..46b063e027 100644
--- a/commands/bootchooser.c
+++ b/commands/bootchooser.c
@@ -1,17 +1,6 @@
-/*
- * Copyright (C) 2012 Jan Luebbe <j.luebbe@pengutronix.de>
- * Copyright (C) 2015 Marc Kleine-Budde <mkl@pengutronix.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2012 Jan Luebbe <j.luebbe@pengutronix.de>
+// SPDX-FileCopyrightText: © 2015 Marc Kleine-Budde <mkl@pengutronix.de>
 
 #include <bootchooser.h>
 #include <globalvar.h>
diff --git a/commands/bootm.c b/commands/bootm.c
index 100c2e99fb..f54a4827eb 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -1,21 +1,5 @@
-/*
- * (C) Copyright 2000-2006
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2000-2006 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
 
 /*
  * Boot support
diff --git a/commands/cat.c b/commands/cat.c
index c01710cfae..17c31ed083 100644
--- a/commands/cat.c
+++ b/commands/cat.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 /**
  * @file
diff --git a/commands/cd.c b/commands/cd.c
index 5611e9a590..0238919bf2 100644
--- a/commands/cd.c
+++ b/commands/cd.c
@@ -1,21 +1,7 @@
-/*
- * cd.c - change working directory
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* cd.c - change working directory */
 
 /**
  * @file
diff --git a/commands/clear.c b/commands/clear.c
index 3be2119da4..56c1da48f2 100644
--- a/commands/clear.c
+++ b/commands/clear.c
@@ -1,21 +1,7 @@
-/*
- * clear.c - Clear the screen
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* clear.c - Clear the screen */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/cmp.c b/commands/cmp.c
index c493988a78..937cfab6c1 100644
--- a/commands/cmp.c
+++ b/commands/cmp.c
@@ -1,20 +1,6 @@
-/*
- * cmp - determine if two files differ
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/* cmp - determine if two files differ */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/cp.c b/commands/cp.c
index 845dae6b15..71448f9aff 100644
--- a/commands/cp.c
+++ b/commands/cp.c
@@ -1,21 +1,7 @@
-/*
- * cp.c - copy files
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* cp.c - copy files */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/crc.c b/commands/crc.c
index 580521d677..80ecf7fe29 100644
--- a/commands/crc.c
+++ b/commands/crc.c
@@ -1,21 +1,7 @@
-/*
- * crc.c - Calculate a crc32 checksum of a memory area
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* crc.c - Calculate a crc32 checksum of a memory area */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/defaultenv.c b/commands/defaultenv.c
index 47bdf26d14..c13d9aaac7 100644
--- a/commands/defaultenv.c
+++ b/commands/defaultenv.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 #include <common.h>
 #include <getopt.h>
diff --git a/commands/detect.c b/commands/detect.c
index 48bab4d020..70eca57537 100644
--- a/commands/detect.c
+++ b/commands/detect.c
@@ -1,21 +1,8 @@
-/*
- * detect.c - detect devices command
- *
- * Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* detect.c - detect devices command */
+
 #include <common.h>
 #include <command.h>
 #include <complete.h>
diff --git a/commands/devinfo.c b/commands/devinfo.c
index cd69d2e5f8..81956b1cc0 100644
--- a/commands/devinfo.c
+++ b/commands/devinfo.c
@@ -1,17 +1,5 @@
-/*
- * Copyright (C) 2013 Sascha Hauer, Pengutronix
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2013 Sascha Hauer, Pengutronix
 
 #include <command.h>
 #include <common.h>
diff --git a/commands/dfu.c b/commands/dfu.c
index 3f52bbdd98..3132a7479d 100644
--- a/commands/dfu.c
+++ b/commands/dfu.c
@@ -1,21 +1,8 @@
-/*
- * dfu.c - device firmware update command
- *
- * Copyright (c) 2009 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2009 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* dfu.c - device firmware update command */
+
 #include <common.h>
 #include <command.h>
 #include <errno.h>
diff --git a/commands/dhcp.c b/commands/dhcp.c
index d9e844b3be..97e9b03e4a 100644
--- a/commands/dhcp.c
+++ b/commands/dhcp.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2015 PHYTEC Messtechnik GmbH
+
 /*
- * Copyright (C) 2015 PHYTEC Messtechnik GmbH,
  * Author: Wadim Egorov <w.egorov@phytec.de>
- *
  * Based on work of Sascha Hauer <s.hauer@pengutronix.de>.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <common.h>
diff --git a/commands/dhrystone.c b/commands/dhrystone.c
index f6772267b3..c839b0c043 100644
--- a/commands/dhrystone.c
+++ b/commands/dhrystone.c
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2014-2015 Phytec Messtechnik GmbH
+
 /*
- * (C) Copyright 2014 - 2015 Phytec Messtechnik GmbH
  * Author: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
  * Author: Daniel Schultz <d.schultz@phytec.de>
  *
@@ -7,16 +9,6 @@
  * Version:    C, Version 2.1
  * Date:       May 25, 1988
  * Author:     Reinhold P. Weicker
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
 #include <common.h>
diff --git a/commands/digest.c b/commands/digest.c
index 21a0917170..b7ed4d50af 100644
--- a/commands/digest.c
+++ b/commands/digest.c
@@ -1,8 +1,5 @@
-/*
- * Copyright (c) 2015 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * GPLv2 ONLY
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2015 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/dirname.c b/commands/dirname.c
index 73cf1e4d43..f809e7648c 100644
--- a/commands/dirname.c
+++ b/commands/dirname.c
@@ -1,21 +1,7 @@
-/*
- * dirname.c - strip directory and suffix from filenames
- *
- * Copyright (c) 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* dirname.c - strip directory and suffix from filenames */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/dmesg.c b/commands/dmesg.c
index a7def2f158..15ad449639 100644
--- a/commands/dmesg.c
+++ b/commands/dmesg.c
@@ -1,21 +1,8 @@
-/*
- * dmesg.c - barebox logbuffer handling
- *
- * Copyright (c) 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* dmesg.c - barebox logbuffer handling */
+
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
diff --git a/commands/drvinfo.c b/commands/drvinfo.c
index 4a4b957537..9f8f971ee9 100644
--- a/commands/drvinfo.c
+++ b/commands/drvinfo.c
@@ -1,18 +1,6 @@
-/*
- * Copyright (C) 2013 Sascha Hauer, Pengutronix
- * Copyright (C) 2014 Holger Schurig
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2013 Sascha Hauer, Pengutronix
+// SPDX-FileCopyrightText: © 2014 Holger Schurig
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/echo.c b/commands/echo.c
index 8853ee0a30..99575b4c0c 100644
--- a/commands/echo.c
+++ b/commands/echo.c
@@ -1,21 +1,7 @@
-/*
- * echo.c - echo arguments to stdout or into a file
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* echo.c - echo arguments to stdout or into a file */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/edit.c b/commands/edit.c
index 4e661df14f..3ab4beaa4f 100644
--- a/commands/edit.c
+++ b/commands/edit.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/exec.c b/commands/exec.c
index 7c8934f137..0b063181b2 100644
--- a/commands/exec.c
+++ b/commands/exec.c
@@ -1,21 +1,7 @@
-/*
- * exec.c - execute scripts
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* exec.c - execute scripts */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/export.c b/commands/export.c
index 4b4cf1e12e..8972b7d528 100644
--- a/commands/export.c
+++ b/commands/export.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 /**
  * @file
diff --git a/commands/false.c b/commands/false.c
index 90aa2cc9ea..90ab579d0e 100644
--- a/commands/false.c
+++ b/commands/false.c
@@ -1,21 +1,5 @@
-/*
- * (C) Copyright 2000-2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2000-2003 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/filetype.c b/commands/filetype.c
index 4e016dd4d6..818c14fe79 100644
--- a/commands/filetype.c
+++ b/commands/filetype.c
@@ -1,8 +1,5 @@
-/*
- * (C) Copyright 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2 Only
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/firmwareload.c b/commands/firmwareload.c
index dbd43e046d..b735088f61 100644
--- a/commands/firmwareload.c
+++ b/commands/firmwareload.c
@@ -1,15 +1,5 @@
-/*
- * Copyright (c) 2013 Juergen Beisert <kernel@pengutronix.de>, Pengutronix
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2013 Juergen Beisert <kernel@pengutronix.de>, Pengutronix
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/flash.c b/commands/flash.c
index d881b4d399..3d7c8fd577 100644
--- a/commands/flash.c
+++ b/commands/flash.c
@@ -1,23 +1,7 @@
-/*
- * erase, protect, unprotect - FLASH support
- *
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2000 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
+
+/* erase, protect, unprotect - FLASH support */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/global.c b/commands/global.c
index c66bf6e539..15b6a9f3d3 100644
--- a/commands/global.c
+++ b/commands/global.c
@@ -1,21 +1,8 @@
-/*
- * global.c - global shell variables
- *
- * Copyright (c) 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* global.c - global shell variables */
+
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
diff --git a/commands/go.c b/commands/go.c
index ecc2ceb6e4..0c0b4cb15e 100644
--- a/commands/go.c
+++ b/commands/go.c
@@ -1,23 +1,7 @@
-/*
- * go- execute some code anywhere (misc boot support)
- *
- * (C) Copyright 2000-2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2000-2003 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
+
+/* go - execute some code anywhere (misc boot support) */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/gpio.c b/commands/gpio.c
index 6d88ab6bbe..955b60e91b 100644
--- a/commands/gpio.c
+++ b/commands/gpio.c
@@ -1,15 +1,4 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/hab.c b/commands/hab.c
index 0d7ee8e76c..97a1701fa5 100644
--- a/commands/hab.c
+++ b/commands/hab.c
@@ -1,13 +1,4 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/hashsum.c b/commands/hashsum.c
index 70aab2c4bf..bfacee0b92 100644
--- a/commands/hashsum.c
+++ b/commands/hashsum.c
@@ -1,21 +1,7 @@
-/*
- * digest.c - Calculate a md5/sha1/sha256 checksum of a memory area
- *
- * Copyright (c) 2011 Peter Korsgaard <jacmet@sunsite.dk>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Peter Korsgaard <jacmet@sunsite.dk>
+
+/* digest.c - Calculate a md5/sha1/sha256 checksum of a memory area */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/help.c b/commands/help.c
index 34ffa9a419..ba8542b90f 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -1,21 +1,5 @@
-/*
- * (C) Copyright 2000-2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2000-2003 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/i2c.c b/commands/i2c.c
index 77a8f7ff97..53f36dfaab 100644
--- a/commands/i2c.c
+++ b/commands/i2c.c
@@ -1,19 +1,7 @@
-/*
- * i2c.c - i2c commands
- *
- * Copyright (c) 2010 Eric Bénard <eric@eukrea.Com>, Eukréa Electromatique
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2010 Eric Bénard <eric@eukrea.Com>, Eukréa Electromatique
+
+/* i2c.c - i2c commands */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/imd.c b/commands/imd.c
index fc6cc47231..912f065c9e 100644
--- a/commands/imd.c
+++ b/commands/imd.c
@@ -1,20 +1,5 @@
-/*
- * (C) Copyright 2014 Sascha Hauer, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2014 Sascha Hauer, Pengutronix
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/iomemport.c b/commands/iomemport.c
index 6d97c5711b..d0cfc413c2 100644
--- a/commands/iomemport.c
+++ b/commands/iomemport.c
@@ -1,20 +1,8 @@
-/*
- * iomem.c - barebox iomem command
- *
- * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* iomem.c - barebox iomem command */
+
 #include <asm/io.h>
 #include <common.h>
 #include <command.h>
diff --git a/commands/ip-route-get.c b/commands/ip-route-get.c
index d3c15b7798..566e12192a 100644
--- a/commands/ip-route-get.c
+++ b/commands/ip-route-get.c
@@ -1,13 +1,4 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <command.h>
 #include <common.h>
diff --git a/commands/led.c b/commands/led.c
index b608fcfa2c..7cf2ceefb8 100644
--- a/commands/led.c
+++ b/commands/led.c
@@ -1,22 +1,7 @@
-/*
- * LED command support for barebox
- *
- * (C) Copyright 2010 Sascha Hauer, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2010 Sascha Hauer, Pengutronix
+
+/* LED command support for barebox */
 
 #include <common.h>
 #include <led.h>
diff --git a/commands/let.c b/commands/let.c
index 3c84d276c1..d6762eb593 100644
--- a/commands/let.c
+++ b/commands/let.c
@@ -1,19 +1,7 @@
-/*
- * Copyright (C) 2012 Jan Luebbe <j.luebbe@pengutronix.de>
- *
- * Partially based on code from BusyBox.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2012 Jan Luebbe <j.luebbe@pengutronix.de>
+
+/* Partially based on code from BusyBox. */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/linux16.c b/commands/linux16.c
index db8d08105f..73e402d877 100644
--- a/commands/linux16.c
+++ b/commands/linux16.c
@@ -1,22 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2009 Juergen Beisert, Pengutronix
+
 /*
- * Copyright (C) 2009 Juergen Beisert, Pengutronix
- *
  * In parts from the GRUB2 project:
  *
  *  GRUB  --  GRand Unified Bootloader
  *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008  Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *
  */
 
 #include <common.h>
diff --git a/commands/linux_exec.c b/commands/linux_exec.c
index 590e0bfd50..5afa2501c4 100644
--- a/commands/linux_exec.c
+++ b/commands/linux_exec.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 
 #include <common.h>
 #include <malloc.h>
diff --git a/commands/ln.c b/commands/ln.c
index f1df32035b..9206480300 100644
--- a/commands/ln.c
+++ b/commands/ln.c
@@ -1,21 +1,7 @@
-/*
- * ln.c - make links between files
- *
- * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
+/* ln.c - make links between files */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/loadb.c b/commands/loadb.c
index 37c272f6c7..17d3af84b5 100644
--- a/commands/loadb.c
+++ b/commands/loadb.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2000-2004 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
 /**
  * @file
  * @brief LoadB and LoadY support.
@@ -7,24 +9,6 @@
  *
  * FileName: commands/loadb.c
  */
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
 
 /*
  * Serial up- and download support
diff --git a/commands/loadenv.c b/commands/loadenv.c
index bf01072c42..279ee52da5 100644
--- a/commands/loadenv.c
+++ b/commands/loadenv.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 /**
  * @file
diff --git a/commands/loads.c b/commands/loads.c
index eb3e109b0b..8260673c51 100644
--- a/commands/loads.c
+++ b/commands/loads.c
@@ -1,25 +1,8 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2000-2004 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
+
+/* Serial up- and download support */
 
-/*
- * Serial up- and download support
- */
 #include <common.h>
 #include <command.h>
 #include <environment.h>
diff --git a/commands/loadxy.c b/commands/loadxy.c
index 85efad67c7..66daa117d9 100644
--- a/commands/loadxy.c
+++ b/commands/loadxy.c
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2012 Robert Jarzmik <robert.jarzmik@free.fr>
+
 /**
  * @file
  * @brief loady and loadx  support.
@@ -7,23 +10,6 @@
  *
  * FileName: commands/loadxy.c
  */
-/*
- * (C) Copyright 2012 Robert Jarzmik <robert.jarzmik@free.fr>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
 
 /*
  * Serial up- and download support
diff --git a/commands/login.c b/commands/login.c
index 58bb592900..7085f3885c 100644
--- a/commands/login.c
+++ b/commands/login.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/ls.c b/commands/ls.c
index e5e37d75c5..6a5475d094 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -1,21 +1,7 @@
-/*
- * ls.c - list files and directories
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* ls.c - list files and directories */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/lspci.c b/commands/lspci.c
index 27edd5d1c2..18e7e4695c 100644
--- a/commands/lspci.c
+++ b/commands/lspci.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (C) 2011-2014 Antony Pavlov <antonynpavlov@gmail.com>
- *
- * This file is part of barebox.
- * See file CREDITS for list of people who contributed to this project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011-2014 Antony Pavlov <antonynpavlov@gmail.com>
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/md.c b/commands/md.c
index 2389c12d14..ef6a1e1bc0 100644
--- a/commands/md.c
+++ b/commands/md.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 /*
  * Memory Functions
diff --git a/commands/memcmp.c b/commands/memcmp.c
index 76fbe078f0..2b3783d66a 100644
--- a/commands/memcmp.c
+++ b/commands/memcmp.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 /*
  * Memory Functions
diff --git a/commands/memcpy.c b/commands/memcpy.c
index b2cea8c09d..2477bba359 100644
--- a/commands/memcpy.c
+++ b/commands/memcpy.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 /*
  * Memory Functions
diff --git a/commands/meminfo.c b/commands/meminfo.c
index 87c76fc3d1..c808caa902 100644
--- a/commands/meminfo.c
+++ b/commands/meminfo.c
@@ -1,21 +1,8 @@
-/*
- * meminfo.c - show information about memory usage
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* meminfo.c - show information about memory usage */
+
 #include <common.h>
 #include <command.h>
 #include <complete.h>
diff --git a/commands/memset.c b/commands/memset.c
index b0770159f8..716cba26de 100644
--- a/commands/memset.c
+++ b/commands/memset.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 /*
  * Memory Functions
diff --git a/commands/memtest.c b/commands/memtest.c
index dc8f7db279..864947fa94 100644
--- a/commands/memtest.c
+++ b/commands/memtest.c
@@ -1,23 +1,7 @@
-/*
- * memtest - Perform a memory test
- *
- * (C) Copyright 2013
- * Alexander Aring <aar@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2013 Alexander Aring <aar@pengutronix.de>, Pengutronix
+
+/* memtest - Perform a memory test */
 
 #include <command.h>
 #include <getopt.h>
diff --git a/commands/menu.c b/commands/menu.c
index ddc9c3ab86..7a01aff280 100644
--- a/commands/menu.c
+++ b/commands/menu.c
@@ -1,20 +1,5 @@
-/*
- * (C) Copyright 2009-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of
- * the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2009-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/menutree.c b/commands/menutree.c
index cf37b01601..129877151f 100644
--- a/commands/menutree.c
+++ b/commands/menutree.c
@@ -1,13 +1,5 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+
 #include <command.h>
 #include <common.h>
 #include <getopt.h>
diff --git a/commands/miitool.c b/commands/miitool.c
index 07437d28a8..47494f5089 100644
--- a/commands/miitool.c
+++ b/commands/miitool.c
@@ -1,10 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Antony Pavlov <antonynpavlov@gmail.com>
+
 /*
- * Copyright (C) 2012 Antony Pavlov <antonynpavlov@gmail.com>
- *
- * This file is part of barebox.
- * See file CREDITS for list of people who contributed to this
- * project.
- *
  * This program is based on Donald Becker's "mii-diag" and
  * David A. Hinds' "mii-tool".
  *
@@ -13,16 +10,6 @@
  *
  * mii-diag is written/copyright 1997-2000 by Donald Becker
  *     <becker@scyld.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
 #include <common.h>
diff --git a/commands/mkdir.c b/commands/mkdir.c
index 7d024c871d..e7153b8732 100644
--- a/commands/mkdir.c
+++ b/commands/mkdir.c
@@ -1,21 +1,7 @@
-/*
- * mkdir.c - create directories
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* mkdir.c - create directories */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/mm.c b/commands/mm.c
index c7f62fca54..f6d66320fb 100644
--- a/commands/mm.c
+++ b/commands/mm.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/mmc_extcsd.c b/commands/mmc_extcsd.c
index 4f566bc805..c9a28fb1fe 100644
--- a/commands/mmc_extcsd.c
+++ b/commands/mmc_extcsd.c
@@ -1,19 +1,7 @@
-/*
- *
- * (C) Copyright 2015 Phytec Messtechnik GmbH
- * Author: Daniel Schultz <d.schultz@phytec.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2015 Phytec Messtechnik GmbH
+
+/* Author: Daniel Schultz <d.schultz@phytec.de> */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/mount.c b/commands/mount.c
index f523f6b3b6..ff1d8bc5e5 100644
--- a/commands/mount.c
+++ b/commands/mount.c
@@ -1,21 +1,7 @@
-/*
- * mount.c - mount devices
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* mount.c - mount devices */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/msleep.c b/commands/msleep.c
index 4aee3c3948..2ca11faad8 100644
--- a/commands/msleep.c
+++ b/commands/msleep.c
@@ -1,19 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix
+
 /*
  * msleep.c - delay execution for n milliseconds
  *
- * Copyright (c) 2012 Steffen Trumtrar <s.trumtrar@pengutronix.de>, Pengutronix
- *
  * derived from commands/sleep.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
 #include <common.h>
diff --git a/commands/mw.c b/commands/mw.c
index 3ed6c820d0..5bd4bdd58f 100644
--- a/commands/mw.c
+++ b/commands/mw.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 /*
  * Memory Functions
diff --git a/commands/nand-bitflip.c b/commands/nand-bitflip.c
index cfde2f4040..7335f77379 100644
--- a/commands/nand-bitflip.c
+++ b/commands/nand-bitflip.c
@@ -1,13 +1,4 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/nand.c b/commands/nand.c
index c57b3945a8..ed2864fb7b 100644
--- a/commands/nand.c
+++ b/commands/nand.c
@@ -1,19 +1,6 @@
-/*
- * Copyright (c) 2008 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2008 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
 #include <common.h>
 #include <command.h>
 #include <fs.h>
diff --git a/commands/nandtest.c b/commands/nandtest.c
index 112bb012a5..bfe4c4c0ed 100644
--- a/commands/nandtest.c
+++ b/commands/nandtest.c
@@ -1,15 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
 /*
  * Based on nandtest.c source in mtd-utils package.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 #include <common.h>
 #include <command.h>
diff --git a/commands/nv.c b/commands/nv.c
index 315019345c..8d4192402c 100644
--- a/commands/nv.c
+++ b/commands/nv.c
@@ -1,21 +1,8 @@
-/*
- * nv.c - non volatile shell variables
- *
- * Copyright (c) 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* nv.c - non volatile shell variables */
+
 #include <common.h>
 #include <malloc.h>
 #include <command.h>
diff --git a/commands/of_diff.c b/commands/of_diff.c
index 8ef006dea8..8acfd42a6b 100644
--- a/commands/of_diff.c
+++ b/commands/of_diff.c
@@ -1,10 +1,7 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * of_diff.c - compare device tree files
- *
- * Copyright (c) 2019 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2019 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* of_diff.c - compare device tree files */
 
 #include <common.h>
 #include <fs.h>
diff --git a/commands/of_display_timings.c b/commands/of_display_timings.c
index 365ff80c36..27b91f311a 100644
--- a/commands/of_display_timings.c
+++ b/commands/of_display_timings.c
@@ -1,20 +1,7 @@
-/*
- * of_display_timings.c - list and select display_timings
- *
- * Copyright (c) 2014 Teresa Gámez <t.gamez@phytec.de> PHYTEC Messtechnik GmbH
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2014 Teresa Gámez <t.gamez@phytec.de>, PHYTEC Messtechnik GmbH
+
+/* of_display_timings.c - list and select display_timings */
 
 #include <common.h>
 #include <filetype.h>
diff --git a/commands/of_dump.c b/commands/of_dump.c
index 06b8e9fcda..6792af3afc 100644
--- a/commands/of_dump.c
+++ b/commands/of_dump.c
@@ -1,21 +1,7 @@
-/*
- * of_dump.c - dump devicetrees to the console
- *
- * Copyright (c) 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* of_dump.c - dump devicetrees to the console */
 
 #include <common.h>
 #include <libfile.h>
diff --git a/commands/of_fixup_status.c b/commands/of_fixup_status.c
index e0da429ac3..50c1bbb146 100644
--- a/commands/of_fixup_status.c
+++ b/commands/of_fixup_status.c
@@ -1,23 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2014-2016 PHYTEC Messtechnik GmbH
+
 /*
  * of_fixup_status.c - Register a fixup to enable or disable nodes in the
  * device tree
  *
- * Copyright (c) 2014-2016 PHYTEC Messtechnik GmbH
- * Author:
- *	Teresa Remmet
- *	Wadim Egorov
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Authors: Teresa Remmet and Wadim Egorov
  */
 
 #include <common.h>
diff --git a/commands/of_node.c b/commands/of_node.c
index 28c4357c5d..7d4eb486ed 100644
--- a/commands/of_node.c
+++ b/commands/of_node.c
@@ -1,21 +1,7 @@
-/*
- * of_node.c - device tree node handling support
- *
- * Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* of_node.c - device tree node handling support */
 
 #include <common.h>
 #include <environment.h>
diff --git a/commands/of_overlay.c b/commands/of_overlay.c
index de3c3dcee5..aa4b6484ca 100644
--- a/commands/of_overlay.c
+++ b/commands/of_overlay.c
@@ -1,19 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2019 Michael Tretter <m.tretter@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2019 Michael Tretter <m.tretter@pengutronix.de>, Pengutronix
 
 #include <command.h>
 #include <common.h>
diff --git a/commands/of_property.c b/commands/of_property.c
index 1d7ba181d5..3d5097165b 100644
--- a/commands/of_property.c
+++ b/commands/of_property.c
@@ -1,21 +1,7 @@
-/*
- * of_property.c - device tree property handling support
- *
- * Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* of_property.c - device tree property handling support */
 
 #include <common.h>
 #include <environment.h>
diff --git a/commands/oftree.c b/commands/oftree.c
index 299c2edfcd..1d902f2830 100644
--- a/commands/oftree.c
+++ b/commands/oftree.c
@@ -1,26 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
 /*
  * oftree.c - device tree command support
  *
- * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
  * based on U-Boot code by:
  *
  * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
  * Pantelis Antoniou <pantelis.antoniou@gmail.com> and
  * Matthew McClintock <msm@freescale.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
 #include <common.h>
diff --git a/commands/partition.c b/commands/partition.c
index 64ccaf0813..44ee0359bf 100644
--- a/commands/partition.c
+++ b/commands/partition.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
 /*
  * partition.c - parse a linux-like mtd partition definition and register
  *               the new partitions
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 
 /**
diff --git a/commands/passwd.c b/commands/passwd.c
index 6f68700c25..dfcc63623a 100644
--- a/commands/passwd.c
+++ b/commands/passwd.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/poweroff.c b/commands/poweroff.c
index bbafa13bd0..9320c07a6c 100644
--- a/commands/poweroff.c
+++ b/commands/poweroff.c
@@ -1,21 +1,7 @@
-/*
- * poweroff.c - turn board's power off
- *
- * Copyright (C) 2011 Antony Pavlov <antonynpavlov@gmail.com>
- *
- * This file is part of barebox.
- * See file CREDITS for list of people who contributed to this project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Antony Pavlov <antonynpavlov@gmail.com>
+
+/* poweroff.c - turn board's power off */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/printenv.c b/commands/printenv.c
index 161c214462..ffe463e654 100644
--- a/commands/printenv.c
+++ b/commands/printenv.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/pwd.c b/commands/pwd.c
index d5dd161931..7a1fe97c40 100644
--- a/commands/pwd.c
+++ b/commands/pwd.c
@@ -1,21 +1,8 @@
-/*
- * pwd.c - print working directory
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* pwd.c - print working directory */
+
 #include <common.h>
 #include <command.h>
 #include <complete.h>
diff --git a/commands/readline.c b/commands/readline.c
index b6e0e3e091..ef54b5e92f 100644
--- a/commands/readline.c
+++ b/commands/readline.c
@@ -1,21 +1,5 @@
-/*
- * (C) Copyright 2000-2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2000-2003 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/readlink.c b/commands/readlink.c
index 2dfa566675..fdcf175f56 100644
--- a/commands/readlink.c
+++ b/commands/readlink.c
@@ -1,21 +1,7 @@
-/*
- * readlink.c - read value of a symbolic link
- *
- * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
+/* readlink.c - read value of a symbolic link */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/reginfo.c b/commands/reginfo.c
index 37816cb261..bd46cf15e7 100644
--- a/commands/reginfo.c
+++ b/commands/reginfo.c
@@ -1,21 +1,7 @@
-/*
- * reginfo.c - print information about SoC specifc registers
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* reginfo.c - print information about SoC specifc registers */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/regulator.c b/commands/regulator.c
index e0b704f88a..3e2595f8bf 100644
--- a/commands/regulator.c
+++ b/commands/regulator.c
@@ -1,21 +1,8 @@
-/*
- * regulator command
- *
- * Copyright (c) 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* regulator command */
+
 #include <common.h>
 #include <command.h>
 #include <regulator.h>
diff --git a/commands/reset.c b/commands/reset.c
index 6eac532623..2b10f1cd18 100644
--- a/commands/reset.c
+++ b/commands/reset.c
@@ -1,21 +1,7 @@
-/*
- * reset.c - reset the cpu
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* reset.c - reset the cpu */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/rm.c b/commands/rm.c
index 4eebb3d159..ba52b185cb 100644
--- a/commands/rm.c
+++ b/commands/rm.c
@@ -1,21 +1,8 @@
-/*
- * rm.c - remove files
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* rm.c - remove files */
+
 #include <common.h>
 #include <command.h>
 #include <fs.h>
diff --git a/commands/saveenv.c b/commands/saveenv.c
index bc1202f9a1..203729efbb 100644
--- a/commands/saveenv.c
+++ b/commands/saveenv.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/seed.c b/commands/seed.c
index e378cd7635..3947208834 100644
--- a/commands/seed.c
+++ b/commands/seed.c
@@ -1,16 +1,5 @@
-/*
- * (c) 2017 Oleksij Rempel <kernel@pengutronix.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2017 Oleksij Rempel <kernel@pengutronix.de>
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/setenv.c b/commands/setenv.c
index af4dd29ac4..3cf769d24a 100644
--- a/commands/setenv.c
+++ b/commands/setenv.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/sleep.c b/commands/sleep.c
index 2491dc261d..b462ef4413 100644
--- a/commands/sleep.c
+++ b/commands/sleep.c
@@ -1,21 +1,7 @@
-/*
- * sleep.c - delay execution
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* sleep.c - delay execution */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/smc.c b/commands/smc.c
index 84102f3249..2a53e1b647 100644
--- a/commands/smc.c
+++ b/commands/smc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/spd_decode.c b/commands/spd_decode.c
index 08b9589622..e8ee339a91 100644
--- a/commands/spd_decode.c
+++ b/commands/spd_decode.c
@@ -1,25 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2015 Alexander Smirnov <alllecs@yandex.ru>
+
 /*
  * This program is decoding and printing SPD contents
  * in human readable format
  * As an argument program, you must specify the file name.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ALTERA CORPORATION BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Copyright (C) 2015 Alexander Smirnov <alllecs@yandex.ru>
  */
 
 #include <common.h>
diff --git a/commands/spi.c b/commands/spi.c
index d35aa1cd81..c6cfd4fbba 100644
--- a/commands/spi.c
+++ b/commands/spi.c
@@ -1,9 +1,5 @@
-/*
- * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * Under GPLv2 only
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/state.c b/commands/state.c
index 0dbca9f3b7..e7cb9902f7 100644
--- a/commands/state.c
+++ b/commands/state.c
@@ -1,16 +1,5 @@
-/*
- * Copyright (C) 2012 Jan Luebbe <j.luebbe@pengutronix.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2012 Jan Luebbe <j.luebbe@pengutronix.de>
 
 #include <common.h>
 #include <getopt.h>
diff --git a/commands/stddev.c b/commands/stddev.c
index 2b3d084c83..e9b7dcc0d2 100644
--- a/commands/stddev.c
+++ b/commands/stddev.c
@@ -1,19 +1,5 @@
-/*
- * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 
 #include <common.h>
 #include <init.h>
diff --git a/commands/test.c b/commands/test.c
index 86636de1c2..505b7c56b1 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -1,23 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
 /*
  * test.c - sh like test
  *
- * Originally based on bareboxs do_test, but mostly reimplemented
+ * Originally based on barebox's do_test, but mostly reimplemented
  * for smaller binary size
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
  */
 #include <common.h>
 #include <command.h>
diff --git a/commands/tftp.c b/commands/tftp.c
index 08366b476f..1569819844 100644
--- a/commands/tftp.c
+++ b/commands/tftp.c
@@ -1,20 +1,8 @@
-/*
- * tftp.c - (up)load tftp files
- *
- * Copyright (c) 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* tftp.c - (up)load tftp files */
+
 #include <common.h>
 #include <command.h>
 #include <linux/stat.h>
diff --git a/commands/timeout.c b/commands/timeout.c
index db88900287..ba55846c55 100644
--- a/commands/timeout.c
+++ b/commands/timeout.c
@@ -1,21 +1,7 @@
-/*
- * timeout - wait for timeout
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* timeout - wait for timeout */
 
 #include <command.h>
 #include <errno.h>
diff --git a/commands/trigger.c b/commands/trigger.c
index 0dd3b346fa..c1402b66f0 100644
--- a/commands/trigger.c
+++ b/commands/trigger.c
@@ -1,22 +1,7 @@
-/*
- * LED trigger command support for barebox
- *
- * (C) Copyright 2010 Sascha Hauer, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2010 Sascha Hauer, Pengutronix
+
+/* LED trigger command support for barebox */
 
 #include <common.h>
 #include <led.h>
diff --git a/commands/true.c b/commands/true.c
index ad2be8e8eb..be76ce5d21 100644
--- a/commands/true.c
+++ b/commands/true.c
@@ -1,21 +1,5 @@
-/*
- * (C) Copyright 2000-2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2000-2003 Wolfgang Denk <wd@denx.de>, DENX Software Engineering
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/ubiformat.c b/commands/ubiformat.c
index 7537e6b567..75cf234e2e 100644
--- a/commands/ubiformat.c
+++ b/commands/ubiformat.c
@@ -1,17 +1,6 @@
-/*
- * Copyright (C) 2008 Nokia Corporation
- * Copyright (C) 2012 Wolfram Sang, Pengutronix
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
- * the GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2008 Nokia Corporation
+// SPDX-FileCopyrightText: © 2012 Wolfram Sang, Pengutronix
 
 /*
  * An utility to format MTD devices into UBI and flash UBI images.
diff --git a/commands/ubsan.c b/commands/ubsan.c
index 784678d399..620b4774c3 100644
--- a/commands/ubsan.c
+++ b/commands/ubsan.c
@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
+
 #include <common.h>
 #include <command.h>
 #include <abort.h>
diff --git a/commands/umount.c b/commands/umount.c
index fdf4da95a0..b26c7c3942 100644
--- a/commands/umount.c
+++ b/commands/umount.c
@@ -1,21 +1,8 @@
-/*
- * umount.c - umount filesystems
- *
- * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* umount.c - umount filesystems */
+
 #include <common.h>
 #include <command.h>
 #include <fs.h>
diff --git a/commands/uncompress.c b/commands/uncompress.c
index 38d53e7491..10884d675b 100644
--- a/commands/uncompress.c
+++ b/commands/uncompress.c
@@ -1,21 +1,7 @@
-/*
- * uncompress.c - uncompress a compressed file
- *
- * Copyright (c) 2010 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2010 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* uncompress.c - uncompress a compressed file */
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/usb.c b/commands/usb.c
index 9a23aa229d..ca8d3e0d52 100644
--- a/commands/usb.c
+++ b/commands/usb.c
@@ -1,21 +1,8 @@
-/*
- * usb.c - rescan for USB devices
- *
- * Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+
+/* usb.c - rescan for USB devices */
+
 #include <common.h>
 #include <command.h>
 #include <complete.h>
diff --git a/commands/usbgadget.c b/commands/usbgadget.c
index e8e1e9adac..193da86dee 100644
--- a/commands/usbgadget.c
+++ b/commands/usbgadget.c
@@ -1,23 +1,9 @@
-/*
- * usbserial.c - usb serial gadget command
- *
- * Copyright (c) 2011 Eric Bénard <eric@eukrea.com>, Eukréa Electromatique
- * based on dfu.c which is :
- * Copyright (c) 2009 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2009 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+// SPDX-FileCopyrightText: © 2011 Eric Bénard <eric@eukrea.com>, Eukréa Electromatique
+
+/* usbserial.c - usb serial gadget command */
+
 #include <common.h>
 #include <command.h>
 #include <environment.h>
diff --git a/commands/usbserial.c b/commands/usbserial.c
index ad6bc63fcc..567018c233 100644
--- a/commands/usbserial.c
+++ b/commands/usbserial.c
@@ -1,23 +1,9 @@
-/*
- * usbserial.c - usb serial gadget command
- *
- * Copyright (c) 2011 Eric Bénard <eric@eukrea.com>, Eukréa Electromatique
- * based on dfu.c which is :
- * Copyright (c) 2009 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: © 2009 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
+// SPDX-FileCopyrightText: © 2011 Eric Bénard <eric@eukrea.com>, Eukréa Electromatique
+
+/* usbserial.c - usb serial gadget command */
+
 #include <common.h>
 #include <command.h>
 #include <errno.h>
diff --git a/commands/version.c b/commands/version.c
index 090f2dd136..764c208767 100644
--- a/commands/version.c
+++ b/commands/version.c
@@ -1,21 +1,5 @@
-/*
- * (C) Copyright 2000-2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © Wolfgang Denk <wd@denx.de>, DENX Software Engineering
 
 #include <common.h>
 #include <command.h>
diff --git a/commands/wd.c b/commands/wd.c
index 8029bab1ce..c186244b2b 100644
--- a/commands/wd.c
+++ b/commands/wd.c
@@ -1,16 +1,5 @@
-/*
- * (c) 2012 Juergen Beisert <kernel@pengutronix.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: © 2012 Juergen Beisert <kernel@pengutronix.de>
 
 #include <common.h>
 #include <command.h>