15 files changed, 17 insertions, 92 deletions
diff --git a/util/release/build-release b/util/release/build-release
index e0f64ffa9e..7ca6001d2b 100755
--- a/util/release/build-release
+++ b/util/release/build-release
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-2.0-only
 # ${VERSION_NAME}: new version name
 # ${COMMIT_ID}: commit id (if not master)
 # ${USERNAME}: username (if not default to https)
diff --git a/util/rockchip/make_idb.py b/util/rockchip/make_idb.py
index 87d8e546ae..12cd130bc5 100755
--- a/util/rockchip/make_idb.py
+++ b/util/rockchip/make_idb.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python2
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# SPDX-License-Identifier: BSD-2-Clause
 
 import struct
 import sys
diff --git a/util/scripts/get_maintainer.pl b/util/scripts/get_maintainer.pl
index c24a6d4d69..e3fe35c6a0 100755
--- a/util/scripts/get_maintainer.pl
+++ b/util/scripts/get_maintainer.pl
@@ -8,7 +8,7 @@
 # usage: perl scripts/get_maintainer.pl [OPTIONS] <patch>
 #        perl scripts/get_maintainer.pl [OPTIONS] -f <file>
 #
-# Licensed under the terms of the GNU GPL License version 2
+# SPDX-License-Identifier: GPL-2.0-only
 
 use strict;
 use warnings;
diff --git a/util/scripts/no-fsf-addresses.sh b/util/scripts/no-fsf-addresses.sh
index a76b533cac..ef54fc1be8 100755
--- a/util/scripts/no-fsf-addresses.sh
+++ b/util/scripts/no-fsf-addresses.sh
@@ -1,15 +1,5 @@
 #!/bin/sh
-# Permission to use, copy, modify, and/or distribute this software for
-# any purpose with or without fee is hereby granted, provided that the
-# above copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# SPDX-License-Identifier: ISC
 
 filelist=$(git ls-files $* | \
 		grep -Ev "^($(git submodule status |cut -d' ' -f3 |tr '\012' '|' | sed "s,|$,,"))$" | \
diff --git a/util/scripts/parse-maintainers.pl b/util/scripts/parse-maintainers.pl
index c0fd88cdc3..2b5d6f7858 100755
--- a/util/scripts/parse-maintainers.pl
+++ b/util/scripts/parse-maintainers.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 
 use strict;
 use warnings;
diff --git a/util/scripts/ucode_h_to_bin.sh b/util/scripts/ucode_h_to_bin.sh
index 163acdf0ad..e2f80a5d9f 100755
--- a/util/scripts/ucode_h_to_bin.sh
+++ b/util/scripts/ucode_h_to_bin.sh
@@ -1,27 +1,5 @@
 #!/usr/bin/env bash
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# 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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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.
-#
+# SPDX-License-Identifier: BSD-2-Clause
 
 if [ -z "$1" ] || [ -z "$2" ]; then
 	printf "Usage: %s <output file> \"<microcode .h files>\"\\n" "$0"
diff --git a/util/spdtool/spdtool.py b/util/spdtool/spdtool.py
index be75e66519..89976eac59 100644
--- a/util/spdtool/spdtool.py
+++ b/util/spdtool/spdtool.py
@@ -1,16 +1,6 @@
 #!/usr/bin/env python
 # spdtool - Tool for partial deblobbing of UEFI firmware images
-#
-# 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 3 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-3.0-or-later
 #
 # Parse a blob and search for SPD files.
 # First it is searched for a possible SPD header.
diff --git a/util/spkmodem_recv/Makefile b/util/spkmodem_recv/Makefile
index 5fdb1958c3..c9659b44eb 100644
--- a/util/spkmodem_recv/Makefile
+++ b/util/spkmodem_recv/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 PREFIX  ?= /usr/local
 INSTALL ?= install
 
diff --git a/util/spkmodem_recv/spkmodem-recv.c b/util/spkmodem_recv/spkmodem-recv.c
index 5148d2cfad..cd7bd483d0 100644
--- a/util/spkmodem_recv/spkmodem-recv.c
+++ b/util/spkmodem_recv/spkmodem-recv.c
@@ -1,15 +1,5 @@
 /* spkmodem-recv.c - decode spkmodem signals */
-/*
- *  spkmodem-recv 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.
- *
- *  spkmodem-recv 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 <stdio.h>
 #include <stdlib.h>
diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index 55583acc7a..21bd2bca75 100644
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -1,14 +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
 
 PROGRAM = superiotool
 
diff --git a/util/uio_usbdebug/Makefile b/util/uio_usbdebug/Makefile
index 74bc80e2e6..af1cc8e1ec 100644
--- a/util/uio_usbdebug/Makefile
+++ b/util/uio_usbdebug/Makefile
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
 include ../../.config
 
 ARCHDIR-$(CONFIG_ARCH_ARMV7)	:= armv7
diff --git a/util/uio_usbdebug/lib/cbmem.c b/util/uio_usbdebug/lib/cbmem.c
index 6d87880acf..d20f3081d5 100644
--- a/util/uio_usbdebug/lib/cbmem.c
+++ b/util/uio_usbdebug/lib/cbmem.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/util/uio_usbdebug/linux/Makefile b/util/uio_usbdebug/linux/Makefile
index fd60b4f7b8..d9415cf7ea 100644
--- a/util/uio_usbdebug/linux/Makefile
+++ b/util/uio_usbdebug/linux/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
 
 obj-m := uio_ehci_pci.o
 
diff --git a/util/uio_usbdebug/linux/uio_ehci_pci.c b/util/uio_usbdebug/linux/uio_ehci_pci.c
index ffc7cfe7e6..db030ac59d 100644
--- a/util/uio_usbdebug/linux/uio_ehci_pci.c
+++ b/util/uio_usbdebug/linux/uio_ehci_pci.c
@@ -1,16 +1,6 @@
 /* uio_ehci_pci - UIO driver for PCI EHCI devices */
-/*
- * This only implements MMIO access (no interrupts).
- *
- * 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.
- */
+/* This only implements MMIO access (no interrupts). */
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <linux/device.h>
 #include <linux/module.h>
diff --git a/util/vgabios/device.c b/util/vgabios/device.c
index b17d965667..d130314d37 100644
--- a/util/vgabios/device.c
+++ b/util/vgabios/device.c
@@ -1,13 +1,4 @@
-/******************************************************************************
- * This program and the accompanying materials
- * are made available under the terms of the BSD License
- * which accompanies this distribution, and is available at
- * http://www.opensource.org/licenses/bsd-license.php
- *
- * Contributors:
- *     IBM Corporation - initial implementation
- *****************************************************************************/
-
+/* SPDX-License-Identifier: BSD-2-Clause */
 
 #include <stdtypes.h>