summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2020-05-10 16:41:01 +0200
committerPatrick Georgi <pgeorgi@google.com>2020-05-11 17:11:40 +0000
commit6b5bc77c9b22c398262ff3f4dae3e14904c57366 (patch)
treeab40c703d92f906f8604635f091f809b59233efa /util
parenta83c6bc907b8ef77935ba62789bc4ed60716986d (diff)
treewide: Remove "this file is part of" lines
Stefan thinks they don't add value. Command used: sed -i -e '/file is part of /d' $(git grep "file is part of " |egrep ":( */\*.*\*/\$|#|;#|-- | *\* )" | cut -d: -f1 |grep -v crossgcc |grep -v gcov | grep -v /elf.h |grep -v nvramtool) The exceptions are for: - crossgcc (patch file) - gcov (imported from gcc) - elf.h (imported from GNU's libc) - nvramtool (more complicated header) The removed lines are: - fmt.Fprintln(f, "/* This file is part of the coreboot project. */") -# This file is part of a set of unofficial pre-commit hooks available -/* This file is part of coreboot */ -# This file is part of msrtool. -/* This file is part of msrtool. */ - * This file is part of ncurses, designed to be appended after curses.h.in -/* This file is part of pgtblgen. */ - * This file is part of the coreboot project. - /* This file is part of the coreboot project. */ -# This file is part of the coreboot project. -# This file is part of the coreboot project. -## This file is part of the coreboot project. --- This file is part of the coreboot project. -/* This file is part of the coreboot project */ -/* This file is part of the coreboot project. */ -;## This file is part of the coreboot project. -# This file is part of the coreboot project. It originated in the - * This file is part of the coreinfo project. -## This file is part of the coreinfo project. - * This file is part of the depthcharge project. -/* This file is part of the depthcharge project. */ -/* This file is part of the ectool project. */ - * This file is part of the GNU C Library. - * This file is part of the libpayload project. -## This file is part of the libpayload project. -/* This file is part of the Linux kernel. */ -## This file is part of the superiotool project. -/* This file is part of the superiotool project */ -/* This file is part of uio_usbdebug */ Change-Id: I82d872b3b337388c93d5f5bf704e9ee9e53ab3a9 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/41194 Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'util')
-rw-r--r--util/amdfwtool/amdfwtool.c1
-rw-r--r--util/autoport/main.go2
-rwxr-xr-xutil/board_status/board_status.sh1
-rwxr-xr-xutil/board_status/getrevision.sh1
-rwxr-xr-xutil/cavium/devicetree_convert.py1
-rw-r--r--util/cbfstool/coff.h1
-rw-r--r--util/cbfstool/console/console.h1
-rw-r--r--util/cbfstool/fv.h1
-rw-r--r--util/cbfstool/linux.h1
-rw-r--r--util/cbfstool/linux_trampoline.h1
-rw-r--r--util/cbmem/Makefile1
-rw-r--r--util/cbmem/cbmem.c1
-rwxr-xr-xutil/chromeos/crosfirmware.sh1
-rwxr-xr-xutil/chromeos/extract_blobs.sh1
-rwxr-xr-xutil/chromeos/gen_test_hwid.sh1
-rw-r--r--util/crossgcc/Makefile.inc2
-rw-r--r--util/docker/Makefile1
-rwxr-xr-xutil/docker/coreboot.org-status/run.sh1
-rw-r--r--util/ectool/ec.c1
-rw-r--r--util/ectool/ec.h1
-rw-r--r--util/ectool/ectool.c1
-rw-r--r--util/fuzz-tests/jpeg-test.c1
-rwxr-xr-xutil/genbuild_h/genbuild_h.sh1
-rwxr-xr-xutil/gitconfig/gitconfig.sh1
-rwxr-xr-xutil/gitconfig/pre-commit1
-rwxr-xr-xutil/gitconfig/test/commit-message-hook.sh1
-rw-r--r--util/gitconfig/test/helpers.sh1
-rwxr-xr-xutil/gitconfig/test/timeout.sh1
-rw-r--r--util/intelmetool/me.c1
-rw-r--r--util/intelmetool/me.h1
-rw-r--r--util/intelmetool/me_status.c1
-rw-r--r--util/intelvbttool/Makefile1
-rw-r--r--util/kbc1126/kbc1126_ec_dump.c1
-rw-r--r--util/kbc1126/kbc1126_ec_insert.c1
-rw-r--r--util/kconfig/toada.c1
-rwxr-xr-xutil/lint/check-style1
-rwxr-xr-xutil/lint/kconfig_lint1
-rwxr-xr-xutil/lint/lint1
-rwxr-xr-xutil/lint/lint-000-license-headers1
-rwxr-xr-xutil/lint/lint-001-no-global-config-in-romstage1
-rwxr-xr-xutil/lint/lint-007-checkpatch1
-rwxr-xr-xutil/lint/lint-008-kconfig1
-rwxr-xr-xutil/lint/lint-014-qualified-types1
-rwxr-xr-xutil/lint/lint-extended-007-checkpatch1
-rwxr-xr-xutil/lint/lint-extended-015-final-newlines1
-rwxr-xr-xutil/lint/lint-extended-020-signed-off-by1
-rwxr-xr-xutil/lint/lint-stable-000-license-headers1
-rwxr-xr-xutil/lint/lint-stable-003-whitespace1
-rwxr-xr-xutil/lint/lint-stable-004-style-labels1
-rwxr-xr-xutil/lint/lint-stable-005-board-status1
-rwxr-xr-xutil/lint/lint-stable-006-board-name1
-rwxr-xr-xutil/lint/lint-stable-008-kconfig1
-rwxr-xr-xutil/lint/lint-stable-009-old-licenses1
-rwxr-xr-xutil/lint/lint-stable-010-asm-syntax1
-rwxr-xr-xutil/lint/lint-stable-012-executable-bit1
-rwxr-xr-xutil/lint/lint-stable-013-site-local1
-rwxr-xr-xutil/lint/lint-stable-016-non-ascii1
-rwxr-xr-xutil/lint/lint-stable-017-configs1
-rwxr-xr-xutil/lint/lint-stable-018-symlinks1
-rwxr-xr-xutil/lint/lint-stable-019-header-files1
-rwxr-xr-xutil/lint/lint-stable-021-coreboot-lowercase1
-rwxr-xr-xutil/lint/lint-stable-022-clang-format1
-rwxr-xr-xutil/lint/lint-stable-023-filenames1
-rw-r--r--util/mainboard/google/hatch/template/Makefile.inc1
-rw-r--r--util/mainboard/google/hatch/template/include/variant/acpi/dptf.asl1
-rw-r--r--util/mainboard/google/hatch/template/include/variant/ec.h1
-rw-r--r--util/mainboard/google/hatch/template/include/variant/gpio.h1
-rw-r--r--util/mainboard/google/volteer/template/Makefile.inc1
-rw-r--r--util/mainboard/google/volteer/template/include/variant/ec.h1
-rw-r--r--util/mainboard/google/volteer/template/include/variant/gpio.h1
-rw-r--r--util/mainboard/google/zork/template/Makefile.inc1
-rwxr-xr-xutil/mma/mma_automated_test.sh1
-rwxr-xr-xutil/mma/mma_get_result.sh1
-rwxr-xr-xutil/mma/mma_setup_test.sh1
-rw-r--r--util/msrtool/Makefile.in1
-rwxr-xr-xutil/msrtool/configure1
-rw-r--r--util/msrtool/cs5536.c1
-rw-r--r--util/msrtool/darwin.c1
-rw-r--r--util/msrtool/freebsd.c1
-rw-r--r--util/msrtool/geodegx2.c1
-rw-r--r--util/msrtool/geodelx.c1
-rw-r--r--util/msrtool/intel_atom.c1
-rw-r--r--util/msrtool/intel_core1.c1
-rw-r--r--util/msrtool/intel_core2_early.c1
-rw-r--r--util/msrtool/intel_core2_later.c1
-rw-r--r--util/msrtool/intel_nehalem.c1
-rw-r--r--util/msrtool/intel_pentium3.c1
-rw-r--r--util/msrtool/intel_pentium3_early.c1
-rw-r--r--util/msrtool/intel_pentium4_early.c1
-rw-r--r--util/msrtool/intel_pentium4_later.c1
-rw-r--r--util/msrtool/intel_pentium_d.c1
-rw-r--r--util/msrtool/k8.c1
-rw-r--r--util/msrtool/linux.c1
-rw-r--r--util/msrtool/msrtool.c1
-rw-r--r--util/msrtool/msrtool.h1
-rw-r--r--util/msrtool/msrutils.c1
-rw-r--r--util/msrtool/sys.c1
-rw-r--r--util/msrtool/via_c7.c1
-rwxr-xr-xutil/mtkheader/gen-bl-img.py1
-rw-r--r--util/pgtblgen/pgtblgen.c1
-rw-r--r--util/pmh7tool/pmh7tool.c1
-rw-r--r--util/pmh7tool/pmh7tool.h1
-rw-r--r--util/qualcomm/scripts/cmm/debug_cb_405.cmm1
-rw-r--r--util/qualcomm/scripts/cmm/debug_cb_845.cmm1
-rw-r--r--util/qualcomm/scripts/cmm/debug_cb_common.cmm1
-rw-r--r--util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm1
-rw-r--r--util/qualcomm/scripts/cmm/debug_chroot_common.cmm1
-rw-r--r--util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm1
-rwxr-xr-xutil/release/genrelnotes1
-rwxr-xr-xutil/release/gerrit_stats.pl1
-rwxr-xr-xutil/riscv/sifive-gpt.py1
-rwxr-xr-xutil/scripts/decode_spd.sh1
-rwxr-xr-xutil/scripts/ucode_h_to_bin.sh1
-rwxr-xr-xutil/scripts/update_submodules1
-rw-r--r--util/superiotool/Makefile1
-rw-r--r--util/superiotool/ali.c1
-rw-r--r--util/superiotool/amd.c1
-rw-r--r--util/superiotool/aspeed.c1
-rw-r--r--util/superiotool/exar.c1
-rw-r--r--util/superiotool/fintek.c1
-rw-r--r--util/superiotool/infineon.c1
-rw-r--r--util/superiotool/ite.c1
-rw-r--r--util/superiotool/nsc.c1
-rw-r--r--util/superiotool/nuvoton.c1
-rw-r--r--util/superiotool/pci.c1
-rw-r--r--util/superiotool/serverengines.c1
-rw-r--r--util/superiotool/smsc.c1
-rw-r--r--util/superiotool/superiotool.c1
-rw-r--r--util/superiotool/superiotool.h1
-rw-r--r--util/superiotool/via.c1
-rw-r--r--util/superiotool/winbond.c1
-rw-r--r--util/supermicro/smcbiosinfo/smcbiosinfo.c1
-rw-r--r--util/testing/Makefile.inc1
-rw-r--r--util/uio_usbdebug/console/printk.c1
-rw-r--r--util/uio_usbdebug/uio_usbdebug_intel.c1
-rw-r--r--util/vgabios/Makefile1
-rw-r--r--util/vgabios/include/arch/byteorder.h1
-rw-r--r--util/vgabios/include/config.h1
-rw-r--r--util/vgabios/include/console/console.h1
-rw-r--r--util/vgabios/include/stdtypes.h1
-rw-r--r--util/vgabios/include/swab.h1
-rw-r--r--util/vgabios/pci-userspace.c1
-rw-r--r--util/vgabios/pci-userspace.h1
-rw-r--r--util/vgabios/testbios.c1
-rw-r--r--util/vgabios/testbios.h1
-rw-r--r--util/x86/x86_page_tables.go1
-rwxr-xr-xutil/xcompile/xcompile1
147 files changed, 0 insertions, 149 deletions
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index e344852815..42c63f1cf1 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
/*
diff --git a/util/autoport/main.go b/util/autoport/main.go
index d0201de2c1..b2334e2b62 100644
--- a/util/autoport/main.go
+++ b/util/autoport/main.go
@@ -214,7 +214,6 @@ func Create(ctx Context, name string) *os.File {
func Add_gpl(f *os.File) {
fmt.Fprintln(f, "/* SPDX-License-Identifier: GPL-2.0-only */")
- fmt.Fprintln(f, "/* This file is part of the coreboot project. */")
fmt.Fprintln(f)
}
@@ -886,7 +885,6 @@ DefinitionBlock(
defer gma.Close()
gma.WriteString(`-- SPDX-License-Identifier: GPL-2.0-or-later
--- This file is part of the coreboot project.
with HW.GFX.GMA;
with HW.GFX.GMA.Display_Probing;
diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh
index 6a5f3c1ba7..2e93fe22fe 100755
--- a/util/board_status/board_status.sh
+++ b/util/board_status/board_status.sh
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# This file is part of the coreboot project.
#
EXIT_SUCCESS=0
diff --git a/util/board_status/getrevision.sh b/util/board_status/getrevision.sh
index d3c99b0346..5b2612eb0d 100755
--- a/util/board_status/getrevision.sh
+++ b/util/board_status/getrevision.sh
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# This file is part of the coreboot project. It originated in the
# flashrom project but has been heavily modified since then.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/util/cavium/devicetree_convert.py b/util/cavium/devicetree_convert.py
index 549ae7493e..71d0120f7d 100755
--- a/util/cavium/devicetree_convert.py
+++ b/util/cavium/devicetree_convert.py
@@ -24,7 +24,6 @@ args = parser.parse_args()
outfile = None
if args.out is not None:
outfile = open(args.out, 'w')
- outfile.write("// This file is part of the coreboot project.\n")
outfile.write("// This file is automatically generated.\n")
outfile.write("// DO NOT EDIT BY HAND.\n\n")
outfile.write("#include <bdk-devicetree.h>\n\n")
diff --git a/util/cbfstool/coff.h b/util/cbfstool/coff.h
index 1035e84ece..316bfd30a4 100644
--- a/util/cbfstool/coff.h
+++ b/util/cbfstool/coff.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#define DOS_MAGIC 0x5a4d
diff --git a/util/cbfstool/console/console.h b/util/cbfstool/console/console.h
index e2cf277a20..0595bea5cc 100644
--- a/util/cbfstool/console/console.h
+++ b/util/cbfstool/console/console.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _CBFSTOOL_CONSOLE_H_
diff --git a/util/cbfstool/fv.h b/util/cbfstool/fv.h
index bf4284e5c7..21bd89f563 100644
--- a/util/cbfstool/fv.h
+++ b/util/cbfstool/fv.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#define FV_SIGNATURE 0x4856465f
diff --git a/util/cbfstool/linux.h b/util/cbfstool/linux.h
index fcf77a5e55..dc4575ca95 100644
--- a/util/cbfstool/linux.h
+++ b/util/cbfstool/linux.h
@@ -1,4 +1,3 @@
-/* This file is part of coreboot */
/* SPDX-License-Identifier: GPL-2.0-only */
/*
diff --git a/util/cbfstool/linux_trampoline.h b/util/cbfstool/linux_trampoline.h
index af77d7cccd..9851b52aa8 100644
--- a/util/cbfstool/linux_trampoline.h
+++ b/util/cbfstool/linux_trampoline.h
@@ -1,4 +1,3 @@
-/* This file is part of coreboot */
/* SPDX-License-Identifier: GPL-2.0-only */
/*
diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
index f0f474ef65..e67efaedae 100644
--- a/util/cbmem/Makefile
+++ b/util/cbmem/Makefile
@@ -1,4 +1,3 @@
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index f49358560d..34e79d368d 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <inttypes.h>
diff --git a/util/chromeos/crosfirmware.sh b/util/chromeos/crosfirmware.sh
index 40cef3a383..25c88fa346 100755
--- a/util/chromeos/crosfirmware.sh
+++ b/util/chromeos/crosfirmware.sh
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/chromeos/extract_blobs.sh b/util/chromeos/extract_blobs.sh
index 9aa7baa944..39f2a3b4e9 100755
--- a/util/chromeos/extract_blobs.sh
+++ b/util/chromeos/extract_blobs.sh
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/chromeos/gen_test_hwid.sh b/util/chromeos/gen_test_hwid.sh
index 21aed18f1a..f77564a971 100755
--- a/util/chromeos/gen_test_hwid.sh
+++ b/util/chromeos/gen_test_hwid.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.inc
index a078e002be..0735b7d624 100644
--- a/util/crossgcc/Makefile.inc
+++ b/util/crossgcc/Makefile.inc
@@ -1,5 +1,3 @@
-## This file is part of the coreboot project.
-##
## SPDX-License-Identifier: GPL-2.0-only
TOOLCHAIN_ARCHES := i386 x64 arm aarch64 riscv ppc64 nds32le
diff --git a/util/docker/Makefile b/util/docker/Makefile
index 6d320e1c46..eaa26e1760 100644
--- a/util/docker/Makefile
+++ b/util/docker/Makefile
@@ -1,4 +1,3 @@
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/docker/coreboot.org-status/run.sh b/util/docker/coreboot.org-status/run.sh
index 46cebbcefd..ba5ec91929 100755
--- a/util/docker/coreboot.org-status/run.sh
+++ b/util/docker/coreboot.org-status/run.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/ectool/ec.c b/util/ectool/ec.c
index e008ac44d0..f30d12f976 100644
--- a/util/ectool/ec.c
+++ b/util/ectool/ec.c
@@ -1,4 +1,3 @@
-/* This file is part of the ectool project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/ectool/ec.h b/util/ectool/ec.h
index 004bd7d9bc..651c35b737 100644
--- a/util/ectool/ec.h
+++ b/util/ectool/ec.h
@@ -1,4 +1,3 @@
-/* This file is part of the ectool project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _EC_H
diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c
index a2c3eef465..0b238c4bb7 100644
--- a/util/ectool/ectool.c
+++ b/util/ectool/ectool.c
@@ -1,4 +1,3 @@
-/* This file is part of the ectool project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/fuzz-tests/jpeg-test.c b/util/fuzz-tests/jpeg-test.c
index cdd93e9d90..69e6c8d79a 100644
--- a/util/fuzz-tests/jpeg-test.c
+++ b/util/fuzz-tests/jpeg-test.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdlib.h>
diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh
index bdd962c108..3df3730ef2 100755
--- a/util/genbuild_h/genbuild_h.sh
+++ b/util/genbuild_h/genbuild_h.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/gitconfig/gitconfig.sh b/util/gitconfig/gitconfig.sh
index f86b2b41c5..148d437788 100755
--- a/util/gitconfig/gitconfig.sh
+++ b/util/gitconfig/gitconfig.sh
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/gitconfig/pre-commit b/util/gitconfig/pre-commit
index 3b04b59607..7b7ab4846c 100755
--- a/util/gitconfig/pre-commit
+++ b/util/gitconfig/pre-commit
@@ -1,5 +1,4 @@
#!/bin/sh
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/gitconfig/test/commit-message-hook.sh b/util/gitconfig/test/commit-message-hook.sh
index 7642746441..a99570f198 100755
--- a/util/gitconfig/test/commit-message-hook.sh
+++ b/util/gitconfig/test/commit-message-hook.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-## This file is part of the coreboot project.
##
## 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
diff --git a/util/gitconfig/test/helpers.sh b/util/gitconfig/test/helpers.sh
index 31e39130b6..2e8b4070f9 100644
--- a/util/gitconfig/test/helpers.sh
+++ b/util/gitconfig/test/helpers.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-## This file is part of the coreboot project.
##
## 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
diff --git a/util/gitconfig/test/timeout.sh b/util/gitconfig/test/timeout.sh
index f404a656f8..989afcc2b4 100755
--- a/util/gitconfig/test/timeout.sh
+++ b/util/gitconfig/test/timeout.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-## This file is part of the coreboot project.
##
## 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
diff --git a/util/intelmetool/me.c b/util/intelmetool/me.c
index b7e2307729..694d733464 100644
--- a/util/intelmetool/me.c
+++ b/util/intelmetool/me.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <pci/pci.h>
diff --git a/util/intelmetool/me.h b/util/intelmetool/me.h
index 57b5475de9..3d579beea9 100644
--- a/util/intelmetool/me.h
+++ b/util/intelmetool/me.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef ME_H
diff --git a/util/intelmetool/me_status.c b/util/intelmetool/me_status.c
index 0970394471..d186f96511 100644
--- a/util/intelmetool/me_status.c
+++ b/util/intelmetool/me_status.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/intelvbttool/Makefile b/util/intelvbttool/Makefile
index 853ac3376b..86081e0f39 100644
--- a/util/intelvbttool/Makefile
+++ b/util/intelvbttool/Makefile
@@ -1,4 +1,3 @@
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/kbc1126/kbc1126_ec_dump.c b/util/kbc1126/kbc1126_ec_dump.c
index f1aaf21040..eb665d3e6f 100644
--- a/util/kbc1126/kbc1126_ec_dump.c
+++ b/util/kbc1126/kbc1126_ec_dump.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <assert.h>
diff --git a/util/kbc1126/kbc1126_ec_insert.c b/util/kbc1126/kbc1126_ec_insert.c
index 92a2505d3e..d8ee0ca46b 100644
--- a/util/kbc1126/kbc1126_ec_insert.c
+++ b/util/kbc1126/kbc1126_ec_insert.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/kconfig/toada.c b/util/kconfig/toada.c
index 1717fd040f..677aaca815 100644
--- a/util/kconfig/toada.c
+++ b/util/kconfig/toada.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <ctype.h>
diff --git a/util/lint/check-style b/util/lint/check-style
index 5d21b8b2e3..06b950bcea 100755
--- a/util/lint/check-style
+++ b/util/lint/check-style
@@ -5,7 +5,6 @@
# - create a patch of the proposed style changes
#
# modifications for clang-format by rene.milk@wwu.de
-# This file is part of a set of unofficial pre-commit hooks available
# at github.
# Link: https://github.com/githubbrowser/Pre-commit-hooks
# Contact: David Martin, david.martin.mailbox@googlemail.com
diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint
index cd4c9a2f3b..8ee6416a31 100755
--- a/util/lint/kconfig_lint
+++ b/util/lint/kconfig_lint
@@ -1,5 +1,4 @@
#!/usr/bin/env perl
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint b/util/lint/lint
index 1420b41a1c..a8c08d5370 100755
--- a/util/lint/lint
+++ b/util/lint/lint
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers
index 3757f37fe6..a1ee3e7117 100755
--- a/util/lint/lint-000-license-headers
+++ b/util/lint/lint-000-license-headers
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-001-no-global-config-in-romstage b/util/lint/lint-001-no-global-config-in-romstage
index 79293ebfff..1ed55e0ca7 100755
--- a/util/lint/lint-001-no-global-config-in-romstage
+++ b/util/lint/lint-001-no-global-config-in-romstage
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-007-checkpatch b/util/lint/lint-007-checkpatch
index a56c62b94b..f78454198f 100755
--- a/util/lint/lint-007-checkpatch
+++ b/util/lint/lint-007-checkpatch
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-008-kconfig b/util/lint/lint-008-kconfig
index 948031a34c..1adb68fafa 100755
--- a/util/lint/lint-008-kconfig
+++ b/util/lint/lint-008-kconfig
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-014-qualified-types b/util/lint/lint-014-qualified-types
index 4a56dd6deb..8da23b6d1f 100755
--- a/util/lint/lint-014-qualified-types
+++ b/util/lint/lint-014-qualified-types
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-extended-007-checkpatch b/util/lint/lint-extended-007-checkpatch
index aa16caf2d6..20ef6c48e1 100755
--- a/util/lint/lint-extended-007-checkpatch
+++ b/util/lint/lint-extended-007-checkpatch
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-extended-015-final-newlines b/util/lint/lint-extended-015-final-newlines
index 67aa27ee92..74f1f03ecc 100755
--- a/util/lint/lint-extended-015-final-newlines
+++ b/util/lint/lint-extended-015-final-newlines
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-extended-020-signed-off-by b/util/lint/lint-extended-020-signed-off-by
index 7700b3a52f..f60a5c3eb3 100755
--- a/util/lint/lint-extended-020-signed-off-by
+++ b/util/lint/lint-extended-020-signed-off-by
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# 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
diff --git a/util/lint/lint-stable-000-license-headers b/util/lint/lint-stable-000-license-headers
index befdf3cd68..7b14b45477 100755
--- a/util/lint/lint-stable-000-license-headers
+++ b/util/lint/lint-stable-000-license-headers
@@ -1,6 +1,5 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0-only
-# This file is part of the coreboot project.
#
# DESCR: Check that files have license headers
diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace
index 1710083a6b..a6e915de58 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-004-style-labels b/util/lint/lint-stable-004-style-labels
index 21aa69d873..36d2581974 100755
--- a/util/lint/lint-stable-004-style-labels
+++ b/util/lint/lint-stable-004-style-labels
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-005-board-status b/util/lint/lint-stable-005-board-status
index edaa0b76c2..d364d71ded 100755
--- a/util/lint/lint-stable-005-board-status
+++ b/util/lint/lint-stable-005-board-status
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# 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
diff --git a/util/lint/lint-stable-006-board-name b/util/lint/lint-stable-006-board-name
index 1458c8b5a8..3fb0adc403 100755
--- a/util/lint/lint-stable-006-board-name
+++ b/util/lint/lint-stable-006-board-name
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# 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
diff --git a/util/lint/lint-stable-008-kconfig b/util/lint/lint-stable-008-kconfig
index 34dec465c8..79e2a86c0c 100755
--- a/util/lint/lint-stable-008-kconfig
+++ b/util/lint/lint-stable-008-kconfig
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-009-old-licenses b/util/lint/lint-stable-009-old-licenses
index 1835a35e14..4d0cb4f4d3 100755
--- a/util/lint/lint-stable-009-old-licenses
+++ b/util/lint/lint-stable-009-old-licenses
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-010-asm-syntax b/util/lint/lint-stable-010-asm-syntax
index 5f02ff567e..344068fcb3 100755
--- a/util/lint/lint-stable-010-asm-syntax
+++ b/util/lint/lint-stable-010-asm-syntax
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-012-executable-bit b/util/lint/lint-stable-012-executable-bit
index 5827a59b1f..46896f42c8 100755
--- a/util/lint/lint-stable-012-executable-bit
+++ b/util/lint/lint-stable-012-executable-bit
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# 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
diff --git a/util/lint/lint-stable-013-site-local b/util/lint/lint-stable-013-site-local
index af660ab9c4..2c63aa602f 100755
--- a/util/lint/lint-stable-013-site-local
+++ b/util/lint/lint-stable-013-site-local
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# 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
diff --git a/util/lint/lint-stable-016-non-ascii b/util/lint/lint-stable-016-non-ascii
index 5bbafbbab2..4c97c37ba0 100755
--- a/util/lint/lint-stable-016-non-ascii
+++ b/util/lint/lint-stable-016-non-ascii
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-017-configs b/util/lint/lint-stable-017-configs
index 1221672f6f..4f298508ce 100755
--- a/util/lint/lint-stable-017-configs
+++ b/util/lint/lint-stable-017-configs
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-018-symlinks b/util/lint/lint-stable-018-symlinks
index c9aa356f5c..8739a8b019 100755
--- a/util/lint/lint-stable-018-symlinks
+++ b/util/lint/lint-stable-018-symlinks
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-019-header-files b/util/lint/lint-stable-019-header-files
index 8114931b29..11cb6b750c 100755
--- a/util/lint/lint-stable-019-header-files
+++ b/util/lint/lint-stable-019-header-files
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-021-coreboot-lowercase b/util/lint/lint-stable-021-coreboot-lowercase
index f9444cec90..45bc8199fd 100755
--- a/util/lint/lint-stable-021-coreboot-lowercase
+++ b/util/lint/lint-stable-021-coreboot-lowercase
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-022-clang-format b/util/lint/lint-stable-022-clang-format
index 439af55a87..031fdb1f39 100755
--- a/util/lint/lint-stable-022-clang-format
+++ b/util/lint/lint-stable-022-clang-format
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/lint/lint-stable-023-filenames b/util/lint/lint-stable-023-filenames
index b864ab9866..a70f988957 100755
--- a/util/lint/lint-stable-023-filenames
+++ b/util/lint/lint-stable-023-filenames
@@ -1,5 +1,4 @@
#!/bin/sh
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/mainboard/google/hatch/template/Makefile.inc b/util/mainboard/google/hatch/template/Makefile.inc
index c4442094e4..61b23ede99 100644
--- a/util/mainboard/google/hatch/template/Makefile.inc
+++ b/util/mainboard/google/hatch/template/Makefile.inc
@@ -1,4 +1,3 @@
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/mainboard/google/hatch/template/include/variant/acpi/dptf.asl b/util/mainboard/google/hatch/template/include/variant/acpi/dptf.asl
index 9b17d4572e..fd3b5cfb4e 100644
--- a/util/mainboard/google/hatch/template/include/variant/acpi/dptf.asl
+++ b/util/mainboard/google/hatch/template/include/variant/acpi/dptf.asl
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <baseboard/acpi/dptf.asl>
diff --git a/util/mainboard/google/hatch/template/include/variant/ec.h b/util/mainboard/google/hatch/template/include/variant/ec.h
index b9fb4f19cc..ce6fbfe1a4 100644
--- a/util/mainboard/google/hatch/template/include/variant/ec.h
+++ b/util/mainboard/google/hatch/template/include/variant/ec.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef VARIANT_EC_H
diff --git a/util/mainboard/google/hatch/template/include/variant/gpio.h b/util/mainboard/google/hatch/template/include/variant/gpio.h
index f37579e911..d08b33bca2 100644
--- a/util/mainboard/google/hatch/template/include/variant/gpio.h
+++ b/util/mainboard/google/hatch/template/include/variant/gpio.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef VARIANT_GPIO_H
diff --git a/util/mainboard/google/volteer/template/Makefile.inc b/util/mainboard/google/volteer/template/Makefile.inc
index c4442094e4..61b23ede99 100644
--- a/util/mainboard/google/volteer/template/Makefile.inc
+++ b/util/mainboard/google/volteer/template/Makefile.inc
@@ -1,4 +1,3 @@
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/mainboard/google/volteer/template/include/variant/ec.h b/util/mainboard/google/volteer/template/include/variant/ec.h
index 55314d3b7d..7a2a6ff8b7 100644
--- a/util/mainboard/google/volteer/template/include/variant/ec.h
+++ b/util/mainboard/google/volteer/template/include/variant/ec.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef __VARIANT_EC_H__
diff --git a/util/mainboard/google/volteer/template/include/variant/gpio.h b/util/mainboard/google/volteer/template/include/variant/gpio.h
index 122f7a434a..5839395456 100644
--- a/util/mainboard/google/volteer/template/include/variant/gpio.h
+++ b/util/mainboard/google/volteer/template/include/variant/gpio.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/*
* 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
diff --git a/util/mainboard/google/zork/template/Makefile.inc b/util/mainboard/google/zork/template/Makefile.inc
index c4442094e4..61b23ede99 100644
--- a/util/mainboard/google/zork/template/Makefile.inc
+++ b/util/mainboard/google/zork/template/Makefile.inc
@@ -1,4 +1,3 @@
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/mma/mma_automated_test.sh b/util/mma/mma_automated_test.sh
index 81ec812e05..b2c9fd918a 100755
--- a/util/mma/mma_automated_test.sh
+++ b/util/mma/mma_automated_test.sh
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-# This file is part of the coreboot project.
#
# 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
diff --git a/util/mma/mma_get_result.sh b/util/mma/mma_get_result.sh
index 48f5360ed3..499d91cb74 100755
--- a/util/mma/mma_get_result.sh
+++ b/util/mma/mma_get_result.sh
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/mma/mma_setup_test.sh b/util/mma/mma_setup_test.sh
index 9680d2e8c6..a13b3f3431 100755
--- a/util/mma/mma_setup_test.sh
+++ b/util/mma/mma_setup_test.sh
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/msrtool/Makefile.in b/util/msrtool/Makefile.in
index 45b4ba280a..7c5966c532 100644
--- a/util/msrtool/Makefile.in
+++ b/util/msrtool/Makefile.in
@@ -1,6 +1,5 @@
# Makefile for msrtool
#
-# This file is part of msrtool.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/configure b/util/msrtool/configure
index 5f55056c9d..cf78ad1410 100755
--- a/util/msrtool/configure
+++ b/util/msrtool/configure
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# This file is part of msrtool.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/cs5536.c b/util/msrtool/cs5536.c
index ce28c4d655..5a5b0cc2a9 100644
--- a/util/msrtool/cs5536.c
+++ b/util/msrtool/cs5536.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/darwin.c b/util/msrtool/darwin.c
index a362086ffd..051ef3bb13 100644
--- a/util/msrtool/darwin.c
+++ b/util/msrtool/darwin.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <sys/types.h>
diff --git a/util/msrtool/freebsd.c b/util/msrtool/freebsd.c
index 1ea4eef1ba..f1afc9a01e 100644
--- a/util/msrtool/freebsd.c
+++ b/util/msrtool/freebsd.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <sys/types.h>
diff --git a/util/msrtool/geodegx2.c b/util/msrtool/geodegx2.c
index 6f6b982430..911c7556b1 100644
--- a/util/msrtool/geodegx2.c
+++ b/util/msrtool/geodegx2.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/geodelx.c b/util/msrtool/geodelx.c
index aa6f8a7efd..42cce4cf1b 100644
--- a/util/msrtool/geodelx.c
+++ b/util/msrtool/geodelx.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_atom.c b/util/msrtool/intel_atom.c
index 3e58d949aa..e220eb0be0 100644
--- a/util/msrtool/intel_atom.c
+++ b/util/msrtool/intel_atom.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_core1.c b/util/msrtool/intel_core1.c
index 7f8717ee5e..144c4ac8d0 100644
--- a/util/msrtool/intel_core1.c
+++ b/util/msrtool/intel_core1.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_core2_early.c b/util/msrtool/intel_core2_early.c
index 4d265311ba..083ea167c9 100644
--- a/util/msrtool/intel_core2_early.c
+++ b/util/msrtool/intel_core2_early.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_core2_later.c b/util/msrtool/intel_core2_later.c
index ef7cfc5dbf..f15e86af2f 100644
--- a/util/msrtool/intel_core2_later.c
+++ b/util/msrtool/intel_core2_later.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_nehalem.c b/util/msrtool/intel_nehalem.c
index 21d8f310e3..b7bd558145 100644
--- a/util/msrtool/intel_nehalem.c
+++ b/util/msrtool/intel_nehalem.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_pentium3.c b/util/msrtool/intel_pentium3.c
index d51d46c742..508fd45b14 100644
--- a/util/msrtool/intel_pentium3.c
+++ b/util/msrtool/intel_pentium3.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_pentium3_early.c b/util/msrtool/intel_pentium3_early.c
index 50cfa24ab7..9142754a9f 100644
--- a/util/msrtool/intel_pentium3_early.c
+++ b/util/msrtool/intel_pentium3_early.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_pentium4_early.c b/util/msrtool/intel_pentium4_early.c
index ac5a1b0bcb..48ce976869 100644
--- a/util/msrtool/intel_pentium4_early.c
+++ b/util/msrtool/intel_pentium4_early.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_pentium4_later.c b/util/msrtool/intel_pentium4_later.c
index 0795ed2a9e..de793e9b8a 100644
--- a/util/msrtool/intel_pentium4_later.c
+++ b/util/msrtool/intel_pentium4_later.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/intel_pentium_d.c b/util/msrtool/intel_pentium_d.c
index f58e5d66fd..127b1e1d04 100644
--- a/util/msrtool/intel_pentium_d.c
+++ b/util/msrtool/intel_pentium_d.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/k8.c b/util/msrtool/k8.c
index 405945d963..dd716004dd 100644
--- a/util/msrtool/k8.c
+++ b/util/msrtool/k8.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/msrtool/linux.c b/util/msrtool/linux.c
index 428f14030c..b2b7bdd218 100644
--- a/util/msrtool/linux.c
+++ b/util/msrtool/linux.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <sys/types.h>
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index b4d721a28f..98e1169592 100644
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index d1f2eb9a82..f5e6738c5c 100644
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.h
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef MSRTOOL_H
diff --git a/util/msrtool/msrutils.c b/util/msrtool/msrutils.c
index 58330ff98f..5298063aba 100644
--- a/util/msrtool/msrutils.c
+++ b/util/msrtool/msrutils.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/msrtool/sys.c b/util/msrtool/sys.c
index f32246ed34..7188705e06 100644
--- a/util/msrtool/sys.c
+++ b/util/msrtool/sys.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <pci/pci.h>
diff --git a/util/msrtool/via_c7.c b/util/msrtool/via_c7.c
index 779144ee15..ae8f831eda 100644
--- a/util/msrtool/via_c7.c
+++ b/util/msrtool/via_c7.c
@@ -1,4 +1,3 @@
-/* This file is part of msrtool. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include "msrtool.h"
diff --git a/util/mtkheader/gen-bl-img.py b/util/mtkheader/gen-bl-img.py
index 473d2a403d..282dfbfa9f 100755
--- a/util/mtkheader/gen-bl-img.py
+++ b/util/mtkheader/gen-bl-img.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python2
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/pgtblgen/pgtblgen.c b/util/pgtblgen/pgtblgen.c
index 780c91c30f..27114edab1 100644
--- a/util/pgtblgen/pgtblgen.c
+++ b/util/pgtblgen/pgtblgen.c
@@ -1,4 +1,3 @@
-/* This file is part of pgtblgen. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/pmh7tool/pmh7tool.c b/util/pmh7tool/pmh7tool.c
index dc9df2d274..346edae14d 100644
--- a/util/pmh7tool/pmh7tool.c
+++ b/util/pmh7tool/pmh7tool.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/pmh7tool/pmh7tool.h b/util/pmh7tool/pmh7tool.h
index 54fdaaf75e..8f5e179d21 100644
--- a/util/pmh7tool/pmh7tool.h
+++ b/util/pmh7tool/pmh7tool.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef PMH7TOOL_H
diff --git a/util/qualcomm/scripts/cmm/debug_cb_405.cmm b/util/qualcomm/scripts/cmm/debug_cb_405.cmm
index bc677e9e62..202209218d 100644
--- a/util/qualcomm/scripts/cmm/debug_cb_405.cmm
+++ b/util/qualcomm/scripts/cmm/debug_cb_405.cmm
@@ -1,6 +1,5 @@
;============================================================================
;##
-;## This file is part of the coreboot project.
;##
;## This program is free software; you can redistribute it and/or modify
;## it under the terms of the GNU General Public License version 2 and
diff --git a/util/qualcomm/scripts/cmm/debug_cb_845.cmm b/util/qualcomm/scripts/cmm/debug_cb_845.cmm
index f99ff26216..034a14bace 100644
--- a/util/qualcomm/scripts/cmm/debug_cb_845.cmm
+++ b/util/qualcomm/scripts/cmm/debug_cb_845.cmm
@@ -1,6 +1,5 @@
;============================================================================
;##
-;## This file is part of the coreboot project.
;##
;## This program is free software; you can redistribute it and/or modify
;## it under the terms of the GNU General Public License version 2 and
diff --git a/util/qualcomm/scripts/cmm/debug_cb_common.cmm b/util/qualcomm/scripts/cmm/debug_cb_common.cmm
index f81d92b7ff..c43621d30c 100644
--- a/util/qualcomm/scripts/cmm/debug_cb_common.cmm
+++ b/util/qualcomm/scripts/cmm/debug_cb_common.cmm
@@ -1,6 +1,5 @@
;============================================================================
;##
-;## This file is part of the coreboot project.
;##
;## This program is free software; you can redistribute it and/or modify
;## it under the terms of the GNU General Public License version 2 and
diff --git a/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm b/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm
index fd12041e4c..5dc73c49b9 100644
--- a/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm
+++ b/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm
@@ -1,6 +1,5 @@
;============================================================================
;##
-;## This file is part of the coreboot project.
;##
;## This program is free software; you can redistribute it and/or modify
;## it under the terms of the GNU General Public License version 2 and
diff --git a/util/qualcomm/scripts/cmm/debug_chroot_common.cmm b/util/qualcomm/scripts/cmm/debug_chroot_common.cmm
index 93c2418a81..75d79cc774 100644
--- a/util/qualcomm/scripts/cmm/debug_chroot_common.cmm
+++ b/util/qualcomm/scripts/cmm/debug_chroot_common.cmm
@@ -1,6 +1,5 @@
;============================================================================
;##
-;## This file is part of the coreboot project.
;##
;## This program is free software; you can redistribute it and/or modify
;## it under the terms of the GNU General Public License version 2 and
diff --git a/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm b/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm
index e84e54d35d..1f1332019c 100644
--- a/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm
+++ b/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm
@@ -1,6 +1,5 @@
;============================================================================
;##
-;## This file is part of the coreboot project.
;##
;## This program is free software; you can redistribute it and/or modify
;## it under the terms of the GNU General Public License version 2 and
diff --git a/util/release/genrelnotes b/util/release/genrelnotes
index 26cf280b79..5803f8cfed 100755
--- a/util/release/genrelnotes
+++ b/util/release/genrelnotes
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/release/gerrit_stats.pl b/util/release/gerrit_stats.pl
index e21877ff23..6500426307 100755
--- a/util/release/gerrit_stats.pl
+++ b/util/release/gerrit_stats.pl
@@ -1,5 +1,4 @@
#!/usr/bin/perl
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/riscv/sifive-gpt.py b/util/riscv/sifive-gpt.py
index e3d7ceb42b..de56f79db7 100755
--- a/util/riscv/sifive-gpt.py
+++ b/util/riscv/sifive-gpt.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python3
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/scripts/decode_spd.sh b/util/scripts/decode_spd.sh
index 8ce28af18e..e515154ee7 100755
--- a/util/scripts/decode_spd.sh
+++ b/util/scripts/decode_spd.sh
@@ -1,6 +1,5 @@
#!/bin/bash
#
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/scripts/ucode_h_to_bin.sh b/util/scripts/ucode_h_to_bin.sh
index e20acfefa4..163acdf0ad 100755
--- a/util/scripts/ucode_h_to_bin.sh
+++ b/util/scripts/ucode_h_to_bin.sh
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-# This file is part of the coreboot project.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
diff --git a/util/scripts/update_submodules b/util/scripts/update_submodules
index 993f58ef0b..854a943cb5 100755
--- a/util/scripts/update_submodules
+++ b/util/scripts/update_submodules
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index dab79a907c..55583acc7a 100644
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -1,4 +1,3 @@
-## This file is part of the superiotool project.
##
## 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
diff --git a/util/superiotool/ali.c b/util/superiotool/ali.c
index 0442062636..3e2e818be9 100644
--- a/util/superiotool/ali.c
+++ b/util/superiotool/ali.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/amd.c b/util/superiotool/amd.c
index 1831b1fa2c..1656f0b314 100644
--- a/util/superiotool/amd.c
+++ b/util/superiotool/amd.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/aspeed.c b/util/superiotool/aspeed.c
index 4e9d684c9d..9fb0a88457 100644
--- a/util/superiotool/aspeed.c
+++ b/util/superiotool/aspeed.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/exar.c b/util/superiotool/exar.c
index 430d6ba32a..af87273206 100644
--- a/util/superiotool/exar.c
+++ b/util/superiotool/exar.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index 1402d480a0..2dcb131b04 100644
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/infineon.c b/util/superiotool/infineon.c
index b11db76e2d..dcd1a009a5 100644
--- a/util/superiotool/infineon.c
+++ b/util/superiotool/infineon.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 00eceed9f8..458250a0e6 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c
index 9159876b51..d9c8955dc5 100644
--- a/util/superiotool/nsc.c
+++ b/util/superiotool/nsc.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/nuvoton.c b/util/superiotool/nuvoton.c
index e6dc9f793b..d2b72f2634 100644
--- a/util/superiotool/nuvoton.c
+++ b/util/superiotool/nuvoton.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/pci.c b/util/superiotool/pci.c
index 0ca2887801..ee8b97d46c 100644
--- a/util/superiotool/pci.c
+++ b/util/superiotool/pci.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/serverengines.c b/util/superiotool/serverengines.c
index f2ac9c5794..b59328fec7 100644
--- a/util/superiotool/serverengines.c
+++ b/util/superiotool/serverengines.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index 3a5147f664..4175d3ee05 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index e93e9261c6..ed18c13e62 100644
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 74e9aa86e2..a621ae5274 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef SUPERIOTOOL_H
diff --git a/util/superiotool/via.c b/util/superiotool/via.c
index 8853462ca4..95ff6dde38 100644
--- a/util/superiotool/via.c
+++ b/util/superiotool/via.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index fe5bbadb63..598955f8fe 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -1,4 +1,3 @@
-/* This file is part of the superiotool project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "superiotool.h"
diff --git a/util/supermicro/smcbiosinfo/smcbiosinfo.c b/util/supermicro/smcbiosinfo/smcbiosinfo.c
index d7a6a301df..6a27ba7a77 100644
--- a/util/supermicro/smcbiosinfo/smcbiosinfo.c
+++ b/util/supermicro/smcbiosinfo/smcbiosinfo.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc
index 80e7fa902d..7c820f59ea 100644
--- a/util/testing/Makefile.inc
+++ b/util/testing/Makefile.inc
@@ -1,5 +1,4 @@
##
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/uio_usbdebug/console/printk.c b/util/uio_usbdebug/console/printk.c
index 4d0e652d1f..3ad9b9ebaf 100644
--- a/util/uio_usbdebug/console/printk.c
+++ b/util/uio_usbdebug/console/printk.c
@@ -1,4 +1,3 @@
-/* This file is part of uio_usbdebug */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/uio_usbdebug/uio_usbdebug_intel.c b/util/uio_usbdebug/uio_usbdebug_intel.c
index 2497f6cb9e..b6c131c7fc 100644
--- a/util/uio_usbdebug/uio_usbdebug_intel.c
+++ b/util/uio_usbdebug/uio_usbdebug_intel.c
@@ -1,4 +1,3 @@
-/* This file is part of uio_usbdebug */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/io.h>
diff --git a/util/vgabios/Makefile b/util/vgabios/Makefile
index dec3c9b438..1baf5ba387 100644
--- a/util/vgabios/Makefile
+++ b/util/vgabios/Makefile
@@ -1,4 +1,3 @@
-## This file is part of the coreboot project.
##
## SPDX-License-Identifier: GPL-2.0-only
diff --git a/util/vgabios/include/arch/byteorder.h b/util/vgabios/include/arch/byteorder.h
index 754ff754a9..349e28b244 100644
--- a/util/vgabios/include/arch/byteorder.h
+++ b/util/vgabios/include/arch/byteorder.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _BYTEORDER_H
diff --git a/util/vgabios/include/config.h b/util/vgabios/include/config.h
index 1b336a1bac..60a5af9685 100644
--- a/util/vgabios/include/config.h
+++ b/util/vgabios/include/config.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project */
/* SPDX-License-Identifier: GPL-2.0-only */
#define CONFIG_PCI_OPTION_ROM_RUN_YABEL 1
diff --git a/util/vgabios/include/console/console.h b/util/vgabios/include/console/console.h
index 49a201fab8..0aa5595590 100644
--- a/util/vgabios/include/console/console.h
+++ b/util/vgabios/include/console/console.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _CONSOLE_CONSOLE_H
diff --git a/util/vgabios/include/stdtypes.h b/util/vgabios/include/stdtypes.h
index 022a1b6854..95bd72df99 100644
--- a/util/vgabios/include/stdtypes.h
+++ b/util/vgabios/include/stdtypes.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _STDTYPES_H
diff --git a/util/vgabios/include/swab.h b/util/vgabios/include/swab.h
index a93e926336..bffabbf015 100644
--- a/util/vgabios/include/swab.h
+++ b/util/vgabios/include/swab.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _SWAB_H
diff --git a/util/vgabios/pci-userspace.c b/util/vgabios/pci-userspace.c
index 3091590b44..5d8a7fedf0 100644
--- a/util/vgabios/pci-userspace.c
+++ b/util/vgabios/pci-userspace.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/vgabios/pci-userspace.h b/util/vgabios/pci-userspace.h
index aeeb344a50..879a91d6e6 100644
--- a/util/vgabios/pci-userspace.h
+++ b/util/vgabios/pci-userspace.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __PCI_USERSPACE_H__
diff --git a/util/vgabios/testbios.c b/util/vgabios/testbios.c
index 7080c50bf6..d66c857bbf 100644
--- a/util/vgabios/testbios.c
+++ b/util/vgabios/testbios.c
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#include <stdio.h>
diff --git a/util/vgabios/testbios.h b/util/vgabios/testbios.h
index c97298c959..487b2b1027 100644
--- a/util/vgabios/testbios.h
+++ b/util/vgabios/testbios.h
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __TESTBIOS_H__
diff --git a/util/x86/x86_page_tables.go b/util/x86/x86_page_tables.go
index 25b7eb7303..8fd24eb281 100644
--- a/util/x86/x86_page_tables.go
+++ b/util/x86/x86_page_tables.go
@@ -1,4 +1,3 @@
-/* This file is part of the coreboot project. */
/* SPDX-License-Identifier: GPL-2.0-only */
package main
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 53a72de9fd..6629546ef1 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
-# This file is part of the coreboot project.
#
# SPDX-License-Identifier: GPL-2.0-only