Treewide: Fix incorrect SPDX license strings

These strings didn't match the license names exactly, so update them
to match.

Change-Id: Ib946eb15ca5fa64cbd6b657350b989b4a4c1b7b7
Signed-off-by: Martin Roth <gaumless@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80583
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>

42 files changed, 42 insertions, 42 deletions

diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile
index 4eee155121..245445e0b9 100644
--- a/util/kconfig/Makefile
+++ b/util/kconfig/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 # ===========================================================================
 # Kernel configuration targets
 # These targets are used from top-level makefile
diff --git a/util/kconfig/conf.c b/util/kconfig/conf.c
index d91f5a2dc8..f13c02c52d 100644
--- a/util/kconfig/conf.c
+++ b/util/kconfig/conf.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c
index a6ee708b4b..3fbd9e7f84 100644
--- a/util/kconfig/confdata.c
+++ b/util/kconfig/confdata.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/expr.c b/util/kconfig/expr.c
index 81ebf8108c..552c214655 100644
--- a/util/kconfig/expr.c
+++ b/util/kconfig/expr.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/expr.h b/util/kconfig/expr.h
index 4a9a23b1b7..90668cab4e 100644
--- a/util/kconfig/expr.h
+++ b/util/kconfig/expr.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/gconf-cfg.sh b/util/kconfig/gconf-cfg.sh
index 040d8f3388..9b7472766f 100755
--- a/util/kconfig/gconf-cfg.sh
+++ b/util/kconfig/gconf-cfg.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 cflags=$1
 libs=$2
diff --git a/util/kconfig/gconf.c b/util/kconfig/gconf.c
index 9709aca3a3..2d630a098b 100644
--- a/util/kconfig/gconf.c
+++ b/util/kconfig/gconf.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002-2003 Romain Lievin <roms@tilp.info>
  */
diff --git a/util/kconfig/images.c b/util/kconfig/images.c
index 2f9afffa5d..ea3bfabd9f 100644
--- a/util/kconfig/images.c
+++ b/util/kconfig/images.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/images.h b/util/kconfig/images.h
index 7212dec200..1e3c73622a 100644
--- a/util/kconfig/images.h
+++ b/util/kconfig/images.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/lexer.l b/util/kconfig/lexer.l
index 2a754a8f1e..fa3f354353 100644
--- a/util/kconfig/lexer.l
+++ b/util/kconfig/lexer.l
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/lexer.lex.c_shipped b/util/kconfig/lexer.lex.c_shipped
index 19540002e0..2de8050475 100644
--- a/util/kconfig/lexer.lex.c_shipped
+++ b/util/kconfig/lexer.lex.c_shipped
@@ -2221,7 +2221,7 @@ int yy_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/list.h b/util/kconfig/list.h
index 45cb237ab7..979cd516d6 100644
--- a/util/kconfig/list.h
+++ b/util/kconfig/list.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef LIST_H
 #define LIST_H
 
diff --git a/util/kconfig/lkc.h b/util/kconfig/lkc.h
index 2bdee9cbae..6989a48e9e 100644
--- a/util/kconfig/lkc.h
+++ b/util/kconfig/lkc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/lkc_proto.h b/util/kconfig/lkc_proto.h
index edd1e617b2..72ac6127ce 100644
--- a/util/kconfig/lkc_proto.h
+++ b/util/kconfig/lkc_proto.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 #include <stdarg.h>
 
 /* confdata.c */
diff --git a/util/kconfig/lxdialog/checklist.c b/util/kconfig/lxdialog/checklist.c
index fd161cfff1..29960ed000 100644
--- a/util/kconfig/lxdialog/checklist.c
+++ b/util/kconfig/lxdialog/checklist.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  checklist.c -- implements the checklist box
  *
diff --git a/util/kconfig/lxdialog/dialog.h b/util/kconfig/lxdialog/dialog.h
index a501abf9fa..3128bd6d76 100644
--- a/util/kconfig/lxdialog/dialog.h
+++ b/util/kconfig/lxdialog/dialog.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  *  dialog.h -- common declarations for all dialog modules
  *
diff --git a/util/kconfig/lxdialog/inputbox.c b/util/kconfig/lxdialog/inputbox.c
index 1dcfb288ee..b8b6f15779 100644
--- a/util/kconfig/lxdialog/inputbox.c
+++ b/util/kconfig/lxdialog/inputbox.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  inputbox.c -- implements the input box
  *
diff --git a/util/kconfig/lxdialog/menubox.c b/util/kconfig/lxdialog/menubox.c
index 0e333284e9..bcdf3bbac9 100644
--- a/util/kconfig/lxdialog/menubox.c
+++ b/util/kconfig/lxdialog/menubox.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  menubox.c -- implements the menu box
  *
diff --git a/util/kconfig/lxdialog/textbox.c b/util/kconfig/lxdialog/textbox.c
index 058ed0e5bb..e02acb7493 100644
--- a/util/kconfig/lxdialog/textbox.c
+++ b/util/kconfig/lxdialog/textbox.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  textbox.c -- implements the text box
  *
diff --git a/util/kconfig/lxdialog/util.c b/util/kconfig/lxdialog/util.c
index 1dacd6c84c..a8578069e3 100644
--- a/util/kconfig/lxdialog/util.c
+++ b/util/kconfig/lxdialog/util.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  util.c
  *
diff --git a/util/kconfig/lxdialog/yesno.c b/util/kconfig/lxdialog/yesno.c
index bcaac9b7ba..ff1db42b3d 100644
--- a/util/kconfig/lxdialog/yesno.c
+++ b/util/kconfig/lxdialog/yesno.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  yesno.c -- implements the yes/no box
  *
diff --git a/util/kconfig/mconf-cfg.sh b/util/kconfig/mconf-cfg.sh
index 99f498336d..74c1c27b7c 100755
--- a/util/kconfig/mconf-cfg.sh
+++ b/util/kconfig/mconf-cfg.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 cflags=$1
 libs=$2
diff --git a/util/kconfig/mconf.c b/util/kconfig/mconf.c
index eccc87a441..078b0a8425 100644
--- a/util/kconfig/mconf.c
+++ b/util/kconfig/mconf.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  *
diff --git a/util/kconfig/menu.c b/util/kconfig/menu.c
index 61c442d84a..d936ccca94 100644
--- a/util/kconfig/menu.c
+++ b/util/kconfig/menu.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/merge_config.sh b/util/kconfig/merge_config.sh
index 902eb429b9..1772b3c050 100755
--- a/util/kconfig/merge_config.sh
+++ b/util/kconfig/merge_config.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 #  merge_config.sh - Takes a list of config fragment values, and merges
 #  them one by one. Provides warnings on overridden values, and specified
diff --git a/util/kconfig/nconf-cfg.sh b/util/kconfig/nconf-cfg.sh
index f871a2160e..9d40960749 100755
--- a/util/kconfig/nconf-cfg.sh
+++ b/util/kconfig/nconf-cfg.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 cflags=$1
 libs=$2
diff --git a/util/kconfig/nconf.c b/util/kconfig/nconf.c
index 143a2c351d..a8c3cc06ca 100644
--- a/util/kconfig/nconf.c
+++ b/util/kconfig/nconf.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com>
  *
diff --git a/util/kconfig/nconf.gui.c b/util/kconfig/nconf.gui.c
index 25a7263ef3..48ba1c1a07 100644
--- a/util/kconfig/nconf.gui.c
+++ b/util/kconfig/nconf.gui.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com>
  *
diff --git a/util/kconfig/nconf.h b/util/kconfig/nconf.h
index ab836d5826..174b035fde 100644
--- a/util/kconfig/nconf.h
+++ b/util/kconfig/nconf.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com>
  *
diff --git a/util/kconfig/parser.y b/util/kconfig/parser.y
index 1c257371ae..21eea842c7 100644
--- a/util/kconfig/parser.y
+++ b/util/kconfig/parser.y
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/preprocess.c b/util/kconfig/preprocess.c
index d1f5bcff4b..a96bcbdc94 100644
--- a/util/kconfig/preprocess.c
+++ b/util/kconfig/preprocess.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 //
 // Copyright (C) 2018 Masahiro Yamada <yamada.masahiro@socionext.com>
 
diff --git a/util/kconfig/qconf-cfg.sh b/util/kconfig/qconf-cfg.sh
index 0e113b0f24..203ddf4203 100755
--- a/util/kconfig/qconf-cfg.sh
+++ b/util/kconfig/qconf-cfg.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 cflags=$1
 libs=$2
diff --git a/util/kconfig/qconf.cc b/util/kconfig/qconf.cc
index 620a3527c7..abf0d0b392 100644
--- a/util/kconfig/qconf.cc
+++ b/util/kconfig/qconf.cc
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Copyright (C) 2015 Boris Barbulovski <bbarbulovski@gmail.com>
diff --git a/util/kconfig/qconf.h b/util/kconfig/qconf.h
index 9196c1c20e..f7e11b3983 100644
--- a/util/kconfig/qconf.h
+++ b/util/kconfig/qconf.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/streamline_config.pl b/util/kconfig/streamline_config.pl
index d51cd7ac15..a9f472c56a 100755
--- a/util/kconfig/streamline_config.pl
+++ b/util/kconfig/streamline_config.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Copyright 2005-2009 - Steven Rostedt
 #
diff --git a/util/kconfig/symbol.c b/util/kconfig/symbol.c
index 34fc66e075..77de8ee347 100644
--- a/util/kconfig/symbol.c
+++ b/util/kconfig/symbol.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  */
diff --git a/util/kconfig/util.c b/util/kconfig/util.c
index b78f114ad4..53e079e2e8 100644
--- a/util/kconfig/util.c
+++ b/util/kconfig/util.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2002-2005 Roman Zippel <zippel@linux-m68k.org>
  * Copyright (C) 2002-2005 Sam Ravnborg <sam@ravnborg.org>
diff --git a/util/lint/checkpatch.pl b/util/lint/checkpatch.pl
index bda7b31d88..b6ac890dff 100755
--- a/util/lint/checkpatch.pl
+++ b/util/lint/checkpatch.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # (c) 2001, Dave Jones. (the file handling bit)
 # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
diff --git a/util/nvramtool/hexdump.c b/util/nvramtool/hexdump.c
index a34f4ef88c..1d4fee1a8e 100644
--- a/util/nvramtool/hexdump.c
+++ b/util/nvramtool/hexdump.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0 */
+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only */
 
 #include "hexdump.h"
 #include <ctype.h>
diff --git a/util/nvramtool/hexdump.h b/util/nvramtool/hexdump.h
index 4b03d85ff3..2a4e5633a9 100644
--- a/util/nvramtool/hexdump.h
+++ b/util/nvramtool/hexdump.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0 */
+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only */
 
 #ifndef _HEXDUMP_H
 #define _HEXDUMP_H
diff --git a/util/scripts/config b/util/scripts/config
index ba11e350e8..084de65f9a 100755
--- a/util/scripts/config
+++ b/util/scripts/config
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 # Manipulate options in a .config file from the command line
 
 myname=${0##*/}
diff --git a/util/scripts/parse-maintainers.pl b/util/scripts/parse-maintainers.pl
index 2b5d6f7858..4b47efe300 100755
--- a/util/scripts/parse-maintainers.pl
+++ b/util/scripts/parse-maintainers.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
 
 use strict;
 use warnings;