24 files changed, 24 insertions, 428 deletions
diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c
index 544e7e9f79..3ae1d6e356 100644
--- a/util/nvramtool/accessors/layout-bin.c
+++ b/util/nvramtool/accessors/layout-bin.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * lbtable.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <string.h>
 #ifndef __MINGW32__
diff --git a/util/nvramtool/accessors/layout-common.c b/util/nvramtool/accessors/layout-common.c
index e41d28127a..a117207d9a 100644
--- a/util/nvramtool/accessors/layout-common.c
+++ b/util/nvramtool/accessors/layout-common.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * layout_common.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <ctype.h>
 
diff --git a/util/nvramtool/accessors/layout-text.c b/util/nvramtool/accessors/layout-text.c
index e7d3e7ffc6..acbe7f8b39 100644
--- a/util/nvramtool/accessors/layout-text.c
+++ b/util/nvramtool/accessors/layout-text.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * layout-text.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include "common.h"
 #include "layout-text.h"
diff --git a/util/nvramtool/accessors/layout-text.h b/util/nvramtool/accessors/layout-text.h
index cb03a77f6f..db8bf489ef 100644
--- a/util/nvramtool/accessors/layout-text.h
+++ b/util/nvramtool/accessors/layout-text.h
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * layout_file.h
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef LAYOUT_FILE_H
 #define LAYOUT_FILE_H
diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h
index 1cb4c660ff..35b98cffd4 100644
--- a/util/nvramtool/cbfs.h
+++ b/util/nvramtool/cbfs.h
@@ -1,42 +1,4 @@
-/*
- * This file is dual-licensed. You can choose between:
- *   - The GNU GPL, version 2, as published by the Free Software Foundation
- *   - The revised BSD license (without advertising clause)
- *
- * ---------------------------------------------------------------------------
- * 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.
- * ---------------------------------------------------------------------------
- * 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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: GPL-2.0-only or BSD-3-Clause */
 
 #ifndef _CBFS_H_
 #define _CBFS_H_
diff --git a/util/nvramtool/cli/nvramtool.c b/util/nvramtool/cli/nvramtool.c
index 30e5ef546a..046bd9b602 100644
--- a/util/nvramtool/cli/nvramtool.c
+++ b/util/nvramtool/cli/nvramtool.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * nvramtool.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/util/nvramtool/cli/opts.c b/util/nvramtool/cli/opts.c
index 18549cf591..38bdfa4a95 100644
--- a/util/nvramtool/cli/opts.c
+++ b/util/nvramtool/cli/opts.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * opts.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include "common.h"
 #include "opts.h"
diff --git a/util/nvramtool/cli/opts.h b/util/nvramtool/cli/opts.h
index 2d087cd0e2..d9a280100b 100644
--- a/util/nvramtool/cli/opts.h
+++ b/util/nvramtool/cli/opts.h
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * opts.h
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef OPTS_H
 #define OPTS_H
diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c
index 410e42769b..f37ea7ab52 100644
--- a/util/nvramtool/cmos_lowlevel.c
+++ b/util/nvramtool/cmos_lowlevel.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * cmos_lowlevel.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #if defined(__FreeBSD__)
 #include <fcntl.h>
diff --git a/util/nvramtool/cmos_lowlevel.h b/util/nvramtool/cmos_lowlevel.h
index 9a7f670c13..3efdbd0775 100644
--- a/util/nvramtool/cmos_lowlevel.h
+++ b/util/nvramtool/cmos_lowlevel.h
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * cmos_lowlevel.h
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef NVRAMTOOL_CMOS_LOWLEVEL_H
 #define NVRAMTOOL_CMOS_LOWLEVEL_H
diff --git a/util/nvramtool/cmos_ops.c b/util/nvramtool/cmos_ops.c
index 6ba7505ff1..02863090d9 100644
--- a/util/nvramtool/cmos_ops.c
+++ b/util/nvramtool/cmos_ops.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * cmos_ops.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include "common.h"
 #include "cmos_ops.h"
diff --git a/util/nvramtool/cmos_ops.h b/util/nvramtool/cmos_ops.h
index c07ed63fcc..8c819df584 100644
--- a/util/nvramtool/cmos_ops.h
+++ b/util/nvramtool/cmos_ops.h
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * cmos_ops.h
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef CMOS_OPS_H
 #define CMOS_OPS_H
diff --git a/util/nvramtool/common.c b/util/nvramtool/common.c
index a1a27066e5..68d2618ca4 100644
--- a/util/nvramtool/common.c
+++ b/util/nvramtool/common.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * common.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include "common.h"
 
diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h
index 4910f91cfb..e15138c7dd 100644
--- a/util/nvramtool/common.h
+++ b/util/nvramtool/common.h
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * common.h
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef COMMON_H
 #define COMMON_H
diff --git a/util/nvramtool/hexdump.c b/util/nvramtool/hexdump.c
index 29cbc34485..a34f4ef88c 100644
--- a/util/nvramtool/hexdump.c
+++ b/util/nvramtool/hexdump.c
@@ -1,44 +1,8 @@
-/*****************************************************************************\
- * hexdump.c
-\*****************************************************************************/
+/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0 */
 
 #include "hexdump.h"
 #include <ctype.h>
 
-/* hexdump.c
- *
- * 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 entire permission notice, including
- *    the following disclaimer of warranties.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions, and the entire permission notice,
- *    including the following disclaimer in the documentation and/or other
- *    materials provided with the distribution.
- * 3. The name(s) of the author(s) may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * ALTERNATIVELY, this product may be distributed under the terms of the GNU
- * General Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions.  (This clause is necessary due
- * to a potential bad interaction between the GPL and the restrictions
- * contained in a BSD-style copyright.)
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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.
- */
-
 static void addrprint(FILE * outfile, uint64_t address, int width);
 
 /*--------------------------------------------------------------------------
diff --git a/util/nvramtool/hexdump.h b/util/nvramtool/hexdump.h
index 98dca51e54..4b03d85ff3 100644
--- a/util/nvramtool/hexdump.h
+++ b/util/nvramtool/hexdump.h
@@ -1,44 +1,8 @@
-/*****************************************************************************\
- * hexdump.h
-\*****************************************************************************/
+/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0 */
 
 #ifndef _HEXDUMP_H
 #define _HEXDUMP_H
 
-/* hexdump.h
- *
- * 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 entire permission notice, including
- *    the following disclaimer of warranties.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions, and the entire permission notice,
- *    including the following disclaimer in the documentation and/or other
- *    materials provided with the distribution.
- * 3. The name(s) of the author(s) may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * ALTERNATIVELY, this product may be distributed under the terms of the GNU
- * General Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions.  (This clause is necessary due
- * to a potential bad interaction between the GPL and the restrictions
- * contained in a BSD-style copyright.)
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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.
- */
-
 #include <stdint.h>
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/util/nvramtool/input_file.c b/util/nvramtool/input_file.c
index a7f0abd8bc..8d2c9f24bf 100644
--- a/util/nvramtool/input_file.c
+++ b/util/nvramtool/input_file.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * input_file.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include "common.h"
 #include "input_file.h"
diff --git a/util/nvramtool/input_file.h b/util/nvramtool/input_file.h
index 7da990533b..b479e48311 100644
--- a/util/nvramtool/input_file.h
+++ b/util/nvramtool/input_file.h
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * input_file.h
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef INPUT_FILE_H
 #define INPUT_FILE_H
diff --git a/util/nvramtool/layout.c b/util/nvramtool/layout.c
index 2fb24e8d6c..582f14c5b6 100644
--- a/util/nvramtool/layout.c
+++ b/util/nvramtool/layout.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * layout.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include "common.h"
 #include "layout.h"
diff --git a/util/nvramtool/layout.h b/util/nvramtool/layout.h
index 798711a4fc..02652e0d8e 100644
--- a/util/nvramtool/layout.h
+++ b/util/nvramtool/layout.h
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * layout.h
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef LAYOUT_H
 #define LAYOUT_H
diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c
index 61dbdfb56f..fd6c9ec1d6 100644
--- a/util/nvramtool/lbtable.c
+++ b/util/nvramtool/lbtable.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * lbtable.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <stdint.h>
 #include <inttypes.h>
diff --git a/util/nvramtool/lbtable.h b/util/nvramtool/lbtable.h
index 2af281998f..829a339557 100644
--- a/util/nvramtool/lbtable.h
+++ b/util/nvramtool/lbtable.h
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * lbtable.h
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef LBTABLE_H
 #define LBTABLE_H
diff --git a/util/nvramtool/reg_expr.c b/util/nvramtool/reg_expr.c
index 3c164e25d1..a3b1aa8a7b 100644
--- a/util/nvramtool/reg_expr.c
+++ b/util/nvramtool/reg_expr.c
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * reg_expr.c
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <stdarg.h>
 #include "common.h"
diff --git a/util/nvramtool/reg_expr.h b/util/nvramtool/reg_expr.h
index c0dad76df0..29977ddb33 100644
--- a/util/nvramtool/reg_expr.h
+++ b/util/nvramtool/reg_expr.h
@@ -1,18 +1,4 @@
-/*****************************************************************************\
- * reg_expr.h
- *****************************************************************************
- *  Please also read the file DISCLAIMER which is included in this software
- *  distribution.
- *
- *  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, dated June 1991.
- *
- *  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 terms and
- *  conditions of the GNU General Public License for more details.
-\*****************************************************************************/
+/* SPDX-License-Identifier: GPL-2.0-only */
 
 #ifndef REG_EXPR_H
 #define REG_EXPR_H