diff --git a/scripts/Makefile b/scripts/Makefile
index 9d55241..e27308a 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,11 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
 ###
 # scripts contains sources for various helper programs used throughout
 # the kernel for the build process.
 # ---------------------------------------------------------------------------
 # docproc:       Used in Documentation/DocBook
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
 
 hostprogs-$(CONFIG_BUILD_BIN2C)		+= bin2c
 
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 2a967ff..00b8fb3 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # This helper makefile is used for creating
 #  - symbolic links (arch/$ARCH/include/asm/arch
 #  - include/autoconf.mk, {spl,tpl}/include/autoconf.mk
@@ -6,9 +7,6 @@
 # When our migration to Kconfig is done
 # (= When we move all CONFIGs from header files to Kconfig)
 # this makefile can be deleted.
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
 
 __all: include/autoconf.mk include/autoconf.mk.dep
 
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 06e5c20..4a6ed34 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Building
 # ==========================================================================
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
 
 # Modified for U-Boot
 prefix := tpl
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index b69533d..4cc468d 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Cleaning up
 # ==========================================================================
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
 
 src := $(obj)
 
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn
index 1d3a570..7ed520f 100644
--- a/scripts/Makefile.extrawarn
+++ b/scripts/Makefile.extrawarn
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 #
 # make W=... settings
@@ -9,9 +10,6 @@
 # $(call cc-option, -W...) handles gcc -W.. options which
 # are not supported by all versions of the compiler
 # ==========================================================================
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
 
 ifeq ("$(origin W)", "command line")
   export KBUILD_ENABLE_EXTRA_GCC_CHECKS := $(W)
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 763a699..e3379a3 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Building binaries on the host system
 # Binaries are used during the compilation of the kernel, for example
@@ -19,9 +20,6 @@
 # qconf-objs      := menu.o
 # Will compile qconf as a C++ program, and menu as a C program.
 # They are linked as C++ code to the executable qconf
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
 
 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
 
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index c6b3f69..f9809ce 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -1,6 +1,4 @@
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
+# SPDX-License-Identifier: GPL-2.0
 # Backward compatibility
 asflags-y  += $(EXTRA_AFLAGS)
 ccflags-y  += $(EXTRA_CFLAGS)
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 7f2908d..09e7cef 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2000-2011
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -8,9 +9,6 @@
 # (C) Copyright 2011
 # Texas Instruments Incorporated - http://www.ti.com/
 # Aneesh V <aneesh@ti.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 # Based on top-level Makefile.
 #
 
diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl
index b399411..ba267d9 100644
--- a/scripts/Makefile.uncmd_spl
+++ b/scripts/Makefile.uncmd_spl
@@ -1,7 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
 # Makefile version of include/config_uncmd_spl.h
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 # TODO: Invent a better way
 
 ifdef CONFIG_SPL_BUILD
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index f883857..092a887 100644
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ###
 # Makefile.basic lists the most basic programs used during the build process.
 # The programs listed herein are what are needed to do the basic stuff,
@@ -7,9 +8,6 @@
 # .config is included by main Makefile.
 # ---------------------------------------------------------------------------
 # fixdep: 	 Used to generate dependency information during build process
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
 
 hostprogs-y	:= fixdep
 always		:= $(hostprogs-y)
diff --git a/scripts/coreboot.sed b/scripts/coreboot.sed
index 42e1f3a..0cbb5fc 100644
--- a/scripts/coreboot.sed
+++ b/scripts/coreboot.sed
@@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (c) 2016 Google, Inc
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 # Script to convert coreboot code to something similar to what U-Boot uses
 # sed -f coreboot.sed <coreboot_file.c>
 # Remember to add attribution to coreboot for new files added to U-Boot.
diff --git a/scripts/fill_scrapyard.py b/scripts/fill_scrapyard.py
index 9a94354..55a7f38 100755
--- a/scripts/fill_scrapyard.py
+++ b/scripts/fill_scrapyard.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python2
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 """
 Fill the "Commit" and "Removed" fields of doc/README.scrapyard
diff --git a/scripts/gcc-stack-usage.sh b/scripts/gcc-stack-usage.sh
index 27ac928..3db32e3 100755
--- a/scripts/gcc-stack-usage.sh
+++ b/scripts/gcc-stack-usage.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
 # Test for gcc '-fstack-usage' support
 # Copyright (C) 2013, Masahiro Yamada <yamada.m@jp.panasonic.com>
 #
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 TMP="$$"
 
diff --git a/scripts/get_default_envs.sh b/scripts/get_default_envs.sh
index 184cc19..2872653 100755
--- a/scripts/get_default_envs.sh
+++ b/scripts/get_default_envs.sh
@@ -1,9 +1,8 @@
 #! /bin/bash
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (C) 2016, Lukasz Majewski <l.majewski@majess.pl>
 #
-# SPDX-License-Identifier:      GPL-2.0+
-#
 
 # This file extracts default envs from built u-boot
 # usage: get_default_envs.sh [build dir] > u-boot-env-default.txt
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index af23812..2542b38 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
 # ===========================================================================
 # Kernel configuration targets
 # These targets are used from top-level makefile
-#
-# SPDX-License-Identifier:	GPL-2.0
-#
 
 PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \
 	localmodconfig localyesconfig
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index 09938ae..fc0b12b 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  checklist.c -- implements the checklist box
  *
@@ -5,8 +6,6 @@
  *     Stuart Herbert - S.Herbert@sheffield.ac.uk: radiolist extension
  *     Alessandro Rubini - rubini@ipvvis.unipv.it: merged the two
  *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include "dialog.h"
diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index cff73a6..b1617ffb 100644
--- a/scripts/kconfig/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  dialog.h -- common declarations for all dialog modules
  *
  *  AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <sys/types.h>
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index f8b7ef7..edeb094 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  inputbox.c -- implements the input box
  *
  *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
  *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include "dialog.h"
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index 99f923e..0ef2319 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  menubox.c -- implements the menu box
  *
  *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
  *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com)
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 /*
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index d3ad43f..ab34000 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  textbox.c -- implements the text box
  *
  *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
  *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include "dialog.h"
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index a6dec28..1b490d4 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  util.c
  *
  *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
  *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <stdarg.h>
diff --git a/scripts/kconfig/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c
index a732e24..274341d 100644
--- a/scripts/kconfig/lxdialog/yesno.c
+++ b/scripts/kconfig/lxdialog/yesno.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  yesno.c -- implements the yes/no box
  *
  *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
  *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include "dialog.h"
diff --git a/scripts/mailmapper b/scripts/mailmapper
index 78b23d1..f73f3dc 100755
--- a/scripts/mailmapper
+++ b/scripts/mailmapper
@@ -1,9 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0+
 #!/usr/bin/env python2
 #
 # Copyright (C) 2014, Masahiro Yamada <yamada.m@jp.panasonic.com>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 '''
 A tool to create/update the mailmap file
diff --git a/scripts/show-gnu-make b/scripts/show-gnu-make
index 26271b5..90a5f38 100755
--- a/scripts/show-gnu-make
+++ b/scripts/show-gnu-make
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Show the command name for GNU Make
 #
@@ -8,9 +9,6 @@
 # It is not a good idea to hard-code the command name in scripts
 # where where GNU Make is expected.
 # Call this helper script to get the command name for GNU Make.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
 
 gnu_make=