5 files changed, 5 insertions, 11 deletions
diff --git a/tools/env/Makefile b/tools/env/Makefile
index 95a03c98e75..4633e0e72ba 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2002-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 # fw_printenv is supposed to run on the target system, which means it should be
 # built with cross tools. Although it may look weird, we only replace "HOSTCC"
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 77eac3d6c17..4b2caf69604 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2008
  * Guennadi Liakhovetski, DENX Software Engineering, lg@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #define _GNU_SOURCE
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
index b86ca78ba27..b250e2f3d75 100644
--- a/tools/env/fw_env.h
+++ b/tools/env/fw_env.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2002-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <stdint.h>
diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c
index fb4afa5ee91..26ba6624cd1 100644
--- a/tools/env/fw_env_main.c
+++ b/tools/env/fw_env_main.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/tools/env/fw_env_private.h b/tools/env/fw_env_private.h
index 0c27da0b86d..86be16dabc6 100644
--- a/tools/env/fw_env_private.h
+++ b/tools/env/fw_env_private.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2002-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /* Pull in the current config to define the default environment */