summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2020-05-08 19:28:13 +0200
committerPatrick Georgi <pgeorgi@google.com>2020-05-09 21:21:32 +0000
commitea063cb9750030d7e5c8f62ed2acfa58c60dd807 (patch)
treeadfb4f0cd3bf0ee1ed7a282557b469ad753836d9
parent2faeb11fcda8791e94fee804a920adfd6272e4d7 (diff)
AUTHORS, util/: Drop individual copyright notices
We have the git history which is a more reliable librarian. Change-Id: Idbcc5ceeb33804204e56d62491cb58146f7c9f37 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/41175 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: ron minnich <rminnich@gmail.com>
-rw-r--r--AUTHORS1
-rwxr-xr-xutil/abuild/abuild5
-rwxr-xr-xutil/acpi/acpidump-all2
-rw-r--r--util/amdfwtool/amdfwtool.c2
-rw-r--r--util/archive/archive.c3
-rw-r--r--util/archive/archive.h3
-rw-r--r--util/bincfg/bincfg.h5
-rw-r--r--util/bincfg/bincfg.l4
-rw-r--r--util/bincfg/bincfg.y4
-rw-r--r--util/bincfg/gbe-ich9m.set2
-rw-r--r--util/bincfg/gbe-ich9m.spec5
-rw-r--r--util/bincfg/ifd-x200.set3
-rw-r--r--util/bincfg/ifd-x200.spec5
-rwxr-xr-xutil/board_status/board_status.sh3
-rwxr-xr-xutil/board_status/getrevision.sh3
-rw-r--r--util/bucts/bucts.c3
-rwxr-xr-xutil/cavium/devicetree_convert.py2
-rw-r--r--util/cbfstool/ProcessorBind.h8
-rw-r--r--util/cbfstool/amdcompress.c5
-rw-r--r--util/cbfstool/cbfs-mkpayload.c6
-rw-r--r--util/cbfstool/cbfs-mkstage.c7
-rw-r--r--util/cbfstool/cbfs-payload-linux.c4
-rw-r--r--util/cbfstool/cbfs.h4
-rw-r--r--util/cbfstool/cbfs_image.c8
-rw-r--r--util/cbfstool/cbfs_image.h5
-rw-r--r--util/cbfstool/cbfs_sections.c5
-rw-r--r--util/cbfstool/cbfs_sections.h5
-rw-r--r--util/cbfstool/cbfscomptool.c5
-rw-r--r--util/cbfstool/cbfstool.c10
-rw-r--r--util/cbfstool/coff.h2
-rw-r--r--util/cbfstool/common.c7
-rw-r--r--util/cbfstool/common.h4
-rw-r--r--util/cbfstool/compress.c10
-rw-r--r--util/cbfstool/console/console.h2
-rw-r--r--util/cbfstool/elfheaders.c5
-rw-r--r--util/cbfstool/elfparsing.h2
-rw-r--r--util/cbfstool/fit.c7
-rw-r--r--util/cbfstool/fit.h7
-rw-r--r--util/cbfstool/flashmap/fmap.c4
-rw-r--r--util/cbfstool/flashmap/fmap.h3
-rw-r--r--util/cbfstool/flashmap/kv_pair.c3
-rw-r--r--util/cbfstool/flashmap/kv_pair.h3
-rw-r--r--util/cbfstool/flashmap/valstr.c3
-rw-r--r--util/cbfstool/flashmap/valstr.h3
-rw-r--r--util/cbfstool/flashmap_tests.c5
-rw-r--r--util/cbfstool/fmap_from_fmd.c5
-rw-r--r--util/cbfstool/fmap_from_fmd.h5
-rw-r--r--util/cbfstool/fmaptool.c5
-rw-r--r--util/cbfstool/fmd.c5
-rw-r--r--util/cbfstool/fmd.h5
-rw-r--r--util/cbfstool/fmd_parser.y5
-rw-r--r--util/cbfstool/fmd_scanner.l5
-rw-r--r--util/cbfstool/fv.h2
-rw-r--r--util/cbfstool/ifittool.c6
-rw-r--r--util/cbfstool/ifwitool.c5
-rw-r--r--util/cbfstool/linux.h3
-rw-r--r--util/cbfstool/linux_trampoline.S5
-rw-r--r--util/cbfstool/linux_trampoline.h6
-rw-r--r--util/cbfstool/option.h5
-rw-r--r--util/cbfstool/partitioned_file.c5
-rw-r--r--util/cbfstool/partitioned_file.h5
-rw-r--r--util/cbfstool/rmodtool.c5
-rw-r--r--util/cbfstool/rmodule.c3
-rw-r--r--util/cbfstool/rmodule.h3
-rw-r--r--util/cbfstool/xdr.c6
-rw-r--r--util/cbmem/Makefile3
-rw-r--r--util/cbmem/cbmem.c3
-rwxr-xr-xutil/chromeos/crosfirmware.sh3
-rwxr-xr-xutil/chromeos/extract_blobs.sh3
-rwxr-xr-xutil/chromeos/gen_test_hwid.sh3
-rw-r--r--util/crossgcc/Makefile.inc3
-rwxr-xr-xutil/crossgcc/buildgcc6
-rw-r--r--util/docker/Makefile3
-rwxr-xr-xutil/docker/coreboot.org-status/kconfig2html3
-rwxr-xr-xutil/docker/coreboot.org-status/run.sh2
-rwxr-xr-xutil/dtd_parser/dtd_parser.py2
-rw-r--r--util/ectool/Makefile6
-rwxr-xr-xutil/exynos/fixed_cksum.py2
-rwxr-xr-xutil/exynos/variable_cksum.py2
-rwxr-xr-xutil/find_usbdebug/find_usbdebug.sh3
-rw-r--r--util/fuzz-tests/jpeg-test.c2
-rwxr-xr-xutil/genbuild_h/genbuild_h.sh3
-rwxr-xr-xutil/gitconfig/commit-msg3
-rwxr-xr-xutil/gitconfig/gitconfig.sh4
-rwxr-xr-xutil/gitconfig/pre-commit4
-rwxr-xr-xutil/gitconfig/test/commit-message-hook.sh4
-rw-r--r--util/gitconfig/test/helpers.sh4
-rwxr-xr-xutil/gitconfig/test/timeout.sh4
-rw-r--r--util/ifdtool/Makefile3
-rw-r--r--util/ifdtool/ifdtool.c5
-rw-r--r--util/ifdtool/ifdtool.h5
-rw-r--r--util/intelmetool/Makefile2
-rw-r--r--util/intelmetool/intelmetool.c5
-rw-r--r--util/intelmetool/intelmetool.h6
-rw-r--r--util/inteltool/Makefile6
-rw-r--r--util/inteltool/amb.c5
-rw-r--r--util/inteltool/cpu.c5
-rw-r--r--util/inteltool/gfx.c6
-rw-r--r--util/inteltool/gpio.c5
-rw-r--r--util/inteltool/gpio_groups.c6
-rw-r--r--util/inteltool/inteltool.c8
-rw-r--r--util/inteltool/inteltool.h6
-rw-r--r--util/inteltool/ivy_memory.c2
-rw-r--r--util/inteltool/lpc.c8
-rw-r--r--util/inteltool/memory.c5
-rw-r--r--util/inteltool/pcie.c6
-rw-r--r--util/inteltool/pcr.c5
-rw-r--r--util/inteltool/pcr.h5
-rw-r--r--util/inteltool/powermgt.c7
-rw-r--r--util/inteltool/rootcmplx.c6
-rw-r--r--util/intelvbttool/Makefile3
-rw-r--r--util/intelvbttool/intelvbttool.c2
-rw-r--r--util/kbc1126/kbc1126_ec_dump.c2
-rw-r--r--util/kbc1126/kbc1126_ec_insert.c2
-rw-r--r--util/kconfig/toada.c3
-rwxr-xr-xutil/lint/checkpatch_json.py4
-rwxr-xr-xutil/lint/kconfig_lint5
-rwxr-xr-xutil/lint/lint-000-license-headers3
-rwxr-xr-xutil/lint/lint-001-no-global-config-in-romstage2
-rwxr-xr-xutil/lint/lint-007-checkpatch2
-rwxr-xr-xutil/lint/lint-008-kconfig2
-rwxr-xr-xutil/lint/lint-014-qualified-types2
-rwxr-xr-xutil/lint/lint-extended-007-checkpatch2
-rwxr-xr-xutil/lint/lint-extended-015-final-newlines2
-rwxr-xr-xutil/lint/lint-extended-020-signed-off-by2
-rwxr-xr-xutil/lint/lint-stable-003-whitespace2
-rwxr-xr-xutil/lint/lint-stable-004-style-labels3
-rwxr-xr-xutil/lint/lint-stable-005-board-status2
-rwxr-xr-xutil/lint/lint-stable-006-board-name2
-rwxr-xr-xutil/lint/lint-stable-008-kconfig2
-rwxr-xr-xutil/lint/lint-stable-009-old-licenses3
-rwxr-xr-xutil/lint/lint-stable-010-asm-syntax2
-rwxr-xr-xutil/lint/lint-stable-012-executable-bit2
-rwxr-xr-xutil/lint/lint-stable-013-site-local2
-rwxr-xr-xutil/lint/lint-stable-016-non-ascii2
-rwxr-xr-xutil/lint/lint-stable-017-configs2
-rwxr-xr-xutil/lint/lint-stable-018-symlinks2
-rwxr-xr-xutil/lint/lint-stable-019-header-files2
-rwxr-xr-xutil/lint/lint-stable-021-coreboot-lowercase2
-rwxr-xr-xutil/lint/lint-stable-022-clang-format2
-rwxr-xr-xutil/lint/lint-stable-023-filenames2
-rw-r--r--util/mainboard/google/volteer/template/Makefile.inc3
-rw-r--r--util/mainboard/google/volteer/template/include/variant/ec.h5
-rw-r--r--util/mainboard/google/volteer/template/include/variant/gpio.h5
-rwxr-xr-xutil/me_cleaner/me_cleaner.py2
-rw-r--r--util/mma/mma.conf1
-rwxr-xr-xutil/mma/mma_automated_test.sh4
-rwxr-xr-xutil/mma/mma_get_result.sh4
-rwxr-xr-xutil/mma/mma_setup_test.sh4
-rwxr-xr-xutil/mtkheader/gen-bl-img.py5
-rw-r--r--util/nvramtool/accessors/layout-bin.c13
-rw-r--r--util/nvramtool/accessors/layout-common.c6
-rw-r--r--util/nvramtool/accessors/layout-text.c12
-rw-r--r--util/nvramtool/accessors/layout-text.h6
-rw-r--r--util/nvramtool/cbfs.c4
-rw-r--r--util/nvramtool/cbfs.h2
-rw-r--r--util/nvramtool/cli/nvramtool.86
-rw-r--r--util/nvramtool/cli/nvramtool.c6
-rw-r--r--util/nvramtool/cli/opts.c6
-rw-r--r--util/nvramtool/cli/opts.h6
-rw-r--r--util/nvramtool/cmos_lowlevel.c6
-rw-r--r--util/nvramtool/cmos_lowlevel.h6
-rw-r--r--util/nvramtool/cmos_ops.c6
-rw-r--r--util/nvramtool/cmos_ops.h6
-rw-r--r--util/nvramtool/common.c6
-rw-r--r--util/nvramtool/common.h6
-rw-r--r--util/nvramtool/hexdump.c5
-rw-r--r--util/nvramtool/hexdump.h5
-rw-r--r--util/nvramtool/input_file.c6
-rw-r--r--util/nvramtool/input_file.h6
-rw-r--r--util/nvramtool/layout.c6
-rw-r--r--util/nvramtool/layout.h6
-rw-r--r--util/nvramtool/lbtable.c7
-rw-r--r--util/nvramtool/lbtable.h6
-rw-r--r--util/nvramtool/reg_expr.c6
-rw-r--r--util/nvramtool/reg_expr.h6
-rw-r--r--util/pmh7tool/Makefile5
-rw-r--r--util/pmh7tool/pmh7tool.c2
-rw-r--r--util/pmh7tool/pmh7tool.h2
-rw-r--r--util/post/post.c2
-rwxr-xr-xutil/qualcomm/createxbl.py2
-rwxr-xr-xutil/qualcomm/ipqheader.py2
-rwxr-xr-xutil/qualcomm/mbn_tools.py2
-rwxr-xr-xutil/release/genrelnotes3
-rwxr-xr-xutil/release/gerrit_stats.pl4
-rwxr-xr-xutil/riscv/sifive-gpt.py2
-rwxr-xr-xutil/rockchip/make_idb.py1
-rw-r--r--util/sconfig/main.c6
-rw-r--r--util/sconfig/sconfig.h6
-rwxr-xr-xutil/sconfig/sconfig.l6
-rw-r--r--util/sconfig/sconfig.tab.c_shipped6
-rwxr-xr-xutil/sconfig/sconfig.y6
-rwxr-xr-xutil/scripts/cross-repo-cherrypick3
-rwxr-xr-xutil/scripts/dts-to-fmd.sh3
-rwxr-xr-xutil/scripts/find-unused-kconfig-symbols.sh2
-rwxr-xr-xutil/scripts/gerrit-rebase3
-rw-r--r--util/scripts/maintainers.go2
-rwxr-xr-xutil/scripts/no-fsf-addresses.sh2
-rwxr-xr-xutil/scripts/ucode_h_to_bin.sh5
-rwxr-xr-xutil/scripts/update_submodules3
-rw-r--r--util/showdevicetree/showdt.c5
-rw-r--r--util/spdtool/spdtool.py2
-rw-r--r--util/spkmodem_recv/spkmodem-recv.c2
-rw-r--r--util/superiotool/Makefile3
-rw-r--r--util/superiotool/ali.c5
-rw-r--r--util/superiotool/amd.c5
-rw-r--r--util/superiotool/aspeed.c5
-rw-r--r--util/superiotool/exar.c6
-rw-r--r--util/superiotool/fintek.c9
-rw-r--r--util/superiotool/infineon.c5
-rw-r--r--util/superiotool/ite.c8
-rw-r--r--util/superiotool/nsc.c6
-rw-r--r--util/superiotool/nuvoton.c6
-rw-r--r--util/superiotool/pci.c5
-rw-r--r--util/superiotool/serverengines.c5
-rw-r--r--util/superiotool/smsc.c6
-rw-r--r--util/superiotool/superiotool.c8
-rw-r--r--util/superiotool/superiotool.h8
-rw-r--r--util/superiotool/via.c5
-rw-r--r--util/superiotool/winbond.c5
-rw-r--r--util/supermicro/smcbiosinfo/smcbiosinfo.c2
-rw-r--r--util/uio_usbdebug/console/printk.c5
-rw-r--r--util/uio_usbdebug/drivers/usb/pci_ehci.c5
-rw-r--r--util/uio_usbdebug/include/device/device.h2
-rw-r--r--util/uio_usbdebug/linux/uio_ehci_pci.c5
-rw-r--r--util/uio_usbdebug/uio_usbdebug.c5
-rw-r--r--util/uio_usbdebug/uio_usbdebug_intel.c5
-rw-r--r--util/vgabios/Makefile3
-rw-r--r--util/vgabios/device.c3
-rw-r--r--util/vgabios/include/arch/byteorder.h2
-rw-r--r--util/vgabios/include/config.h5
-rw-r--r--util/vgabios/include/console/console.h2
-rw-r--r--util/vgabios/include/stdtypes.h2
-rw-r--r--util/vgabios/pci-userspace.c2
-rw-r--r--util/vgabios/pci-userspace.h2
-rw-r--r--util/vgabios/testbios.c2
-rw-r--r--util/vgabios/testbios.h2
-rw-r--r--util/x86/x86_page_tables.go2
-rwxr-xr-xutil/xcompile/xcompile5
239 files changed, 87 insertions, 913 deletions
diff --git a/AUTHORS b/AUTHORS
index 4bc62a7b63..8b1cb22608 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -51,6 +51,7 @@ David Greenman
David Hendricks
David Mosberger-Tang
David Mueller
+David S. Peterson
Denis 'GNUtoo' Carikli
Denis Dowling
DENX Software Engineering
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 3b8612119f..b6a6bfeda7 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -4,11 +4,6 @@
#
# This script builds coreboot images for all available targets.
#
-# (C) 2004 by Stefan Reinauer <stepan@openbios.org>
-# (C) 2006-2010 by coresystems GmbH <info@coresystems.de>
-# (C) 2013-2014 Sage Electronic Engineering, LLC
-# (C) 2014 Patrick Georgi <patrick@georgi-clan.de>
-#
# This file is subject to the terms and conditions of the GNU General
# Public License. See the file COPYING in the main directory of this
# archive for more details.
diff --git a/util/acpi/acpidump-all b/util/acpi/acpidump-all
index f43b7ef720..29bf254ff7 100755
--- a/util/acpi/acpidump-all
+++ b/util/acpi/acpidump-all
@@ -1,7 +1,5 @@
#!/usr/bin/env bash
#
-# Copyright (C) 2007-2010 by coresystems GmbH
-#
# 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.
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 1ff86e6c88..bb4266d486 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2015 - 2016 Advanced Micro Devices, Inc.
- *
* 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.
diff --git a/util/archive/archive.c b/util/archive/archive.c
index 36c0ab1a87..384a98025f 100644
--- a/util/archive/archive.c
+++ b/util/archive/archive.c
@@ -1,7 +1,4 @@
/*
- * Copyright (C) 2015 The ChromiumOS Authors. All rights reserved.
- * written by Daisuke Nojiri <dnojiri@chromium.org>
- *
* 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.
diff --git a/util/archive/archive.h b/util/archive/archive.h
index 67c42e2bbb..c7fe53f659 100644
--- a/util/archive/archive.h
+++ b/util/archive/archive.h
@@ -1,7 +1,4 @@
/*
- * Copyright (C) 2015 The ChromiumOS Authors. All rights reserved.
- * written by Daisuke Nojiri <dnojiri@chromium.org>
- *
* 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.
diff --git a/util/bincfg/bincfg.h b/util/bincfg/bincfg.h
index b8c668889e..1f2d270bc8 100644
--- a/util/bincfg/bincfg.h
+++ b/util/bincfg/bincfg.h
@@ -1,8 +1,5 @@
+/* bincfg - Compiler/Decompiler for data blobs with specs */
/*
- * bincfg - Compiler/Decompiler for data blobs with specs
- * Copyright (C) 2017 Damien Zammit <damien@zamaudio.com>
- * Copyright (C) 2018 Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
- *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
diff --git a/util/bincfg/bincfg.l b/util/bincfg/bincfg.l
index f9e880f333..5f9a2c93d0 100644
--- a/util/bincfg/bincfg.l
+++ b/util/bincfg/bincfg.l
@@ -1,7 +1,5 @@
+/* bincfg - Compiler/Decompiler for data blobs with specs */
/*
- * bincfg - Compiler/Decompiler for data blobs with specs
- * Copyright (C) 2017 Damien Zammit <damien@zamaudio.com>
- *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
diff --git a/util/bincfg/bincfg.y b/util/bincfg/bincfg.y
index 8be11e9a92..5c65d75cfe 100644
--- a/util/bincfg/bincfg.y
+++ b/util/bincfg/bincfg.y
@@ -1,7 +1,5 @@
+/* bincfg - Compiler/Decompiler for data blobs with specs */
/*
- * bincfg - Compiler/Decompiler for data blobs with specs
- * Copyright (C) 2017 Damien Zammit <damien@zamaudio.com>
- *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
diff --git a/util/bincfg/gbe-ich9m.set b/util/bincfg/gbe-ich9m.set
index 01f85aba86..712551d447 100644
--- a/util/bincfg/gbe-ich9m.set
+++ b/util/bincfg/gbe-ich9m.set
@@ -1,6 +1,4 @@
#
-# Copyright (C) 2017 Damien Zammit <damien@zamaudio.com>
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
diff --git a/util/bincfg/gbe-ich9m.spec b/util/bincfg/gbe-ich9m.spec
index 45eed0e043..02394d77a3 100644
--- a/util/bincfg/gbe-ich9m.spec
+++ b/util/bincfg/gbe-ich9m.spec
@@ -1,8 +1,3 @@
-#
-# Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
-# Leah Rowe <info@minifree.org>
-# Copyright (C) 2017 Damien Zammit <damien@zamaudio.com>
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
diff --git a/util/bincfg/ifd-x200.set b/util/bincfg/ifd-x200.set
index 255eb88b70..4aa5bf053f 100644
--- a/util/bincfg/ifd-x200.set
+++ b/util/bincfg/ifd-x200.set
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2017 Damien Zammit <damien@zamaudio.com>
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
diff --git a/util/bincfg/ifd-x200.spec b/util/bincfg/ifd-x200.spec
index 0cdbb9d2dd..c9c8c1d8ed 100644
--- a/util/bincfg/ifd-x200.spec
+++ b/util/bincfg/ifd-x200.spec
@@ -1,8 +1,3 @@
-#
-# Copyright (C) 2014 Steve Shenton <sgsit@libreboot.org>
-# Copyright (C) 2014, 2015 Leah Rowe <info@minifree.org>
-# Copyright (C) 2017 Damien Zammit <damien@zamaudio.com>
-#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh
index a990ce505e..6a5f3c1ba7 100755
--- a/util/board_status/board_status.sh
+++ b/util/board_status/board_status.sh
@@ -2,9 +2,6 @@
#
# This file is part of the coreboot project.
#
-# Copyright (C) 2013 Google Inc.
-# Copyright (C) 2014 Sage Electronic Engineering, LLC.
-#
EXIT_SUCCESS=0
EXIT_FAILURE=1
diff --git a/util/board_status/getrevision.sh b/util/board_status/getrevision.sh
index 168c972f30..d3c99b0346 100755
--- a/util/board_status/getrevision.sh
+++ b/util/board_status/getrevision.sh
@@ -3,9 +3,6 @@
# This file is part of the coreboot project. It originated in the
# flashrom project but has been heavily modified since then.
#
-# Copyright (C) 2013 Stefan Tauner
-# Copyright (C) 2013 Google Inc.
-#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/util/bucts/bucts.c b/util/bucts/bucts.c
index a4bca3039f..f932e5b4ab 100644
--- a/util/bucts/bucts.c
+++ b/util/bucts/bucts.c
@@ -1,7 +1,4 @@
/*
- * Copyright (C) 2011 Peter Stuge <peter@stuge.se>
- * Copyright (C) 2017-2018 Arthur Heymans <arthur@aheymans.xyz>
- *
* 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.
diff --git a/util/cavium/devicetree_convert.py b/util/cavium/devicetree_convert.py
index 827e5a7a6a..549ae7493e 100755
--- a/util/cavium/devicetree_convert.py
+++ b/util/cavium/devicetree_convert.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python2
-
# devicetree_convert Tool to convert a DTB to a static C file
-# Copyright (C) 2018 Facebook Inc.
#
# 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/cbfstool/ProcessorBind.h b/util/cbfstool/ProcessorBind.h
index c0f4df0ee5..7cad59c544 100644
--- a/util/cbfstool/ProcessorBind.h
+++ b/util/cbfstool/ProcessorBind.h
@@ -1,8 +1,8 @@
/** @file
- Processor or Compiler specific defines and types for IA-32 architecture.
+ * Processor or Compiler specific defines and types for IA-32 architecture.
+ */
-Copyright 2015 Google Inc.
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+/*
This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at
@@ -11,7 +11,7 @@ http://opensource.org/licenses/bsd-license.php.
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-**/
+*/
#ifndef __PROCESSOR_BIND_H__
#define __PROCESSOR_BIND_H__
diff --git a/util/cbfstool/amdcompress.c b/util/cbfstool/amdcompress.c
index 641e1ea6c0..a42cfc2504 100644
--- a/util/cbfstool/amdcompress.c
+++ b/util/cbfstool/amdcompress.c
@@ -1,8 +1,5 @@
+/* AMD Family 17h and later BIOS compressor */
/*
- * AMD Family 17h and later BIOS compressor
- *
- * Copyright (C) 2019 Advanced Micro Devices, Inc.
- *
* 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.
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 830fe16fc1..c06319088c 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -1,10 +1,4 @@
/*
- * cbfs-mkpayload
- *
- * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
- * 2009 coresystems GmbH
- * written by Patrick Georgi <patrick.georgi@coresystems.de>
- *
* 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.
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index be920b4598..3f6b0268c5 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -1,11 +1,4 @@
/*
- * cbfs-mkstage
- *
- * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
- * 2009 coresystems GmbH
- * written by Patrick Georgi <patrick.georgi@coresystems.de>
- * Copyright (C) 2012 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c
index 6b4bf27b85..2b5a4b9e70 100644
--- a/util/cbfstool/cbfs-payload-linux.c
+++ b/util/cbfstool/cbfs-payload-linux.c
@@ -1,8 +1,4 @@
/*
- * cbfs-payload-linux
- *
- * Copyright (C) 2013 Patrick Georgi <patrick@georgi-clan.de>
- *
* 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.
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index f0c215d0d7..11e80c43d7 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -1,8 +1,4 @@
/*
- * Copyright (C) 2009 coresystems GmbH
- * written by Patrick Georgi <patrick.georgi@coresystems.de>
- * Copyright (C) 2016 Siemens AG
- *
* 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.
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 9bf3688304..a0b2a82d8e 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -1,11 +1,5 @@
+/* CBFS Image Manipulation */
/*
- * CBFS Image Manipulation
- *
- * Copyright (C) 2013 The Chromium OS Authors. All rights reserved.
- * Copyright (C) 2016 Siemens AG. All rights reserved.
- * Copyright (C) 2019 9elements Agency GmbH
- * Copyright (C) 2019 Facebook Inc.
- *
* 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.
diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h
index 1bb3c686e5..fa460f1ba1 100644
--- a/util/cbfstool/cbfs_image.h
+++ b/util/cbfstool/cbfs_image.h
@@ -1,8 +1,5 @@
+/* CBFS Image Manipulation */
/*
- * CBFS Image Manipulation
- *
- * Copyright (C) 2013 The Chromium OS Authors. All rights reserved.
- *
* 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.
diff --git a/util/cbfstool/cbfs_sections.c b/util/cbfstool/cbfs_sections.c
index 088534adc9..c5f016f08a 100644
--- a/util/cbfstool/cbfs_sections.c
+++ b/util/cbfstool/cbfs_sections.c
@@ -1,8 +1,5 @@
+/* track which sections of the image will contain CBFSes */
/*
- * fmap_sections.c, track which sections of the image will contain CBFSes
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/cbfs_sections.h b/util/cbfstool/cbfs_sections.h
index 3526f8d94c..c968a68d8b 100644
--- a/util/cbfstool/cbfs_sections.h
+++ b/util/cbfstool/cbfs_sections.h
@@ -1,8 +1,5 @@
+/* fmap_sections.h, track which sections of the image will contain CBFSes */
/*
- * fmap_sections.h, track which sections of the image will contain CBFSes
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/cbfscomptool.c b/util/cbfstool/cbfscomptool.c
index 028893c35f..b50d4efafc 100644
--- a/util/cbfstool/cbfscomptool.c
+++ b/util/cbfstool/cbfscomptool.c
@@ -1,8 +1,5 @@
+/* cbfs-compression-tool, CLI utility for dealing with CBFS compressed data */
/*
- * cbfs-compression-tool, CLI utility for dealing with CBFS compressed data
- *
- * Copyright (C) 2017 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index f15c65b6e7..1421c8ec3e 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -1,13 +1,5 @@
+/* cbfstool, CLI utility for CBFS file manipulation */
/*
- * cbfstool, CLI utility for CBFS file manipulation
- *
- * Copyright (C) 2009 coresystems GmbH
- * written by Patrick Georgi <patrick.georgi@coresystems.de>
- * Copyright (C) 2012 Google, Inc.
- * Copyright (C) 2016 Siemens AG
- * Copyright (C) 2019 9elements Agency GmbH
- * Copyright (C) 2019 Facebook Inc.
- *
* 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.
diff --git a/util/cbfstool/coff.h b/util/cbfstool/coff.h
index 3ee1b6a0f3..da0ea17379 100644
--- a/util/cbfstool/coff.h
+++ b/util/cbfstool/coff.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2013 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index c1725dc903..2de67dcf7b 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -1,10 +1,5 @@
+/* common utility functions for cbfstool */
/*
- * common utility functions for cbfstool
- *
- * Copyright (C) 2009 coresystems GmbH
- * written by Patrick Georgi <patrick.georgi@coresystems.de>
- * Copyright (C) 2012 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index f1521043e9..94c1a98028 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -1,8 +1,4 @@
/*
- * Copyright (C) 2009 coresystems GmbH
- * written by Patrick Georgi <patrick.georgi@coresystems.de>
- * Copyright (C) 2012 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/compress.c b/util/cbfstool/compress.c
index 993809426f..b92da0eac3 100644
--- a/util/cbfstool/compress.c
+++ b/util/cbfstool/compress.c
@@ -1,13 +1,5 @@
+/* compression handling for cbfstool */
/*
- * compression handling for cbfstool
- *
- * Copyright (C) 2009 coresystems GmbH
- * written by Patrick Georgi <patrick.georgi@coresystems.de>
- *
- * Adapted from code
- * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>, released
- * under identical license terms
- *
* 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.
diff --git a/util/cbfstool/console/console.h b/util/cbfstool/console/console.h
index daf0458e93..9c393f13d5 100644
--- a/util/cbfstool/console/console.h
+++ b/util/cbfstool/console/console.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright 2015 Google Inc.
- *
* 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.
diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index 53fe7a1fca..216e2778ee 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -1,8 +1,5 @@
+/* elf header parsing */
/*
- * elf header parsing.
- *
- * Copyright (C) 2013 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/elfparsing.h b/util/cbfstool/elfparsing.h
index 8b08c135af..1cc6eb2c33 100644
--- a/util/cbfstool/elfparsing.h
+++ b/util/cbfstool/elfparsing.h
@@ -1,6 +1,4 @@
/*
- * Copyright (C) 2014 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c
index 8ba50f7919..f35872022f 100644
--- a/util/cbfstool/fit.c
+++ b/util/cbfstool/fit.c
@@ -1,10 +1,5 @@
+/* Firmware Interface Table support */
/*
- * Firmware Interface Table support.
- *
- * Copyright (C) 2012 Google Inc.
- * Copyright (C) 2019 9elements Agency GmbH
- * Copyright (C) 2019 Facebook Inc.
- *
* 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.
diff --git a/util/cbfstool/fit.h b/util/cbfstool/fit.h
index c647ec506e..feec0cf28a 100644
--- a/util/cbfstool/fit.h
+++ b/util/cbfstool/fit.h
@@ -1,10 +1,5 @@
+/* Firmware Interface Table support */
/*
- * Firmware Interface Table support.
- *
- * Copyright (C) 2012 Google Inc.
- * Copyright (C) 2019 9elements Agency GmbH
- * Copyright (C) 2019 Facebook Inc.
- *
* 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.
diff --git a/util/cbfstool/flashmap/fmap.c b/util/cbfstool/flashmap/fmap.c
index 6255fc5633..ca84dcc978 100644
--- a/util/cbfstool/flashmap/fmap.c
+++ b/util/cbfstool/flashmap/fmap.c
@@ -1,6 +1,4 @@
-/* Copyright 2015, Google Inc.
- * All rights reserved.
- *
+/*
* 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/cbfstool/flashmap/fmap.h b/util/cbfstool/flashmap/fmap.h
index 7f147ce3e9..a9b4e43747 100644
--- a/util/cbfstool/flashmap/fmap.h
+++ b/util/cbfstool/flashmap/fmap.h
@@ -1,7 +1,4 @@
/*
- * Copyright 2015, Google Inc.
- * All rights reserved.
- *
* 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/cbfstool/flashmap/kv_pair.c b/util/cbfstool/flashmap/kv_pair.c
index c02068c1c2..55be8196f5 100644
--- a/util/cbfstool/flashmap/kv_pair.c
+++ b/util/cbfstool/flashmap/kv_pair.c
@@ -1,7 +1,4 @@
/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
* 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/cbfstool/flashmap/kv_pair.h b/util/cbfstool/flashmap/kv_pair.h
index 1185a08d52..0029a5d58b 100644
--- a/util/cbfstool/flashmap/kv_pair.h
+++ b/util/cbfstool/flashmap/kv_pair.h
@@ -1,7 +1,4 @@
/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
* 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/cbfstool/flashmap/valstr.c b/util/cbfstool/flashmap/valstr.c
index 4843962f1b..32a4d385e2 100644
--- a/util/cbfstool/flashmap/valstr.c
+++ b/util/cbfstool/flashmap/valstr.c
@@ -1,7 +1,4 @@
/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
* 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/cbfstool/flashmap/valstr.h b/util/cbfstool/flashmap/valstr.h
index 9b57d58cfd..b2e3fbeb11 100644
--- a/util/cbfstool/flashmap/valstr.h
+++ b/util/cbfstool/flashmap/valstr.h
@@ -1,7 +1,4 @@
/*
- * Copyright 2010, Google Inc.
- * All rights reserved.
- *
* 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/cbfstool/flashmap_tests.c b/util/cbfstool/flashmap_tests.c
index aabe5ff19e..d6483dbaf4 100644
--- a/util/cbfstool/flashmap_tests.c
+++ b/util/cbfstool/flashmap_tests.c
@@ -1,8 +1,5 @@
+/* fmap_from_fmd.c, simple launcher for fmap library unit test suite */
/*
- * fmap_from_fmd.c, simple launcher for fmap library unit test suite
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/fmap_from_fmd.c b/util/cbfstool/fmap_from_fmd.c
index 374667a373..1773050125 100644
--- a/util/cbfstool/fmap_from_fmd.c
+++ b/util/cbfstool/fmap_from_fmd.c
@@ -1,8 +1,5 @@
+/* fmap_from_fmd.c, tool to distill flashmap descriptors into raw FMAP sections */
/*
- * fmap_from_fmd.c, tool to distill flashmap descriptors into raw FMAP sections
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/fmap_from_fmd.h b/util/cbfstool/fmap_from_fmd.h
index 6159cfa318..8464aa5497 100644
--- a/util/cbfstool/fmap_from_fmd.h
+++ b/util/cbfstool/fmap_from_fmd.h
@@ -1,8 +1,5 @@
+/* fmap_from_fmd.h, tool to distill flashmap descriptors into raw FMAP sections */
/*
- * fmap_from_fmd.h, tool to distill flashmap descriptors into raw FMAP sections
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/fmaptool.c b/util/cbfstool/fmaptool.c
index 1c01ec0da9..3b10f79e5b 100644
--- a/util/cbfstool/fmaptool.c
+++ b/util/cbfstool/fmaptool.c
@@ -1,8 +1,5 @@
+/* fmaptool, CLI utility for converting plaintext fmd files into fmap blobs */
/*
- * fmaptool, CLI utility for converting plaintext fmd files into fmap blobs
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/fmd.c b/util/cbfstool/fmd.c
index 7a289d7743..5d990cad7f 100644
--- a/util/cbfstool/fmd.c
+++ b/util/cbfstool/fmd.c
@@ -1,8 +1,5 @@
+/* fmd.c, parser frontend and utility functions for flashmap descriptor language */
/*
- * fmd.c, parser frontend and utility functions for flashmap descriptor language
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/fmd.h b/util/cbfstool/fmd.h
index 90e6d6e176..8a9e1518cb 100644
--- a/util/cbfstool/fmd.h
+++ b/util/cbfstool/fmd.h
@@ -1,8 +1,5 @@
+/* parser frontend and utility functions for flashmap descriptor language */
/*
- * fmd.h, parser frontend and utility functions for flashmap descriptor language
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/fmd_parser.y b/util/cbfstool/fmd_parser.y
index 3ba710c289..b10835e895 100644
--- a/util/cbfstool/fmd_parser.y
+++ b/util/cbfstool/fmd_parser.y
@@ -1,8 +1,5 @@
+/* parser generator for flashmap descriptor language */
/*
- * fmd_parser.y, parser generator for flashmap descriptor language
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/fmd_scanner.l b/util/cbfstool/fmd_scanner.l
index be9a5def84..525fe6f743 100644
--- a/util/cbfstool/fmd_scanner.l
+++ b/util/cbfstool/fmd_scanner.l
@@ -1,8 +1,5 @@
+/* scanner generator for flashmap descriptor language */
/*
- * fmd_scanner.l, scanner generator for flashmap descriptor language
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/fv.h b/util/cbfstool/fv.h
index 996508d186..8a6031d9c8 100644
--- a/util/cbfstool/fv.h
+++ b/util/cbfstool/fv.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2013 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/ifittool.c b/util/cbfstool/ifittool.c
index dce37c8084..3a9c37e097 100644
--- a/util/cbfstool/ifittool.c
+++ b/util/cbfstool/ifittool.c
@@ -1,9 +1,5 @@
+/* cbfstool, CLI utility for creating rmodules */
/*
- * cbfstool, CLI utility for creating rmodules
- *
- * Copyright (C) 2019 9elements Agency GmbH
- * Copyright (C) 2019 Facebook Inc.
- *
* 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.
diff --git a/util/cbfstool/ifwitool.c b/util/cbfstool/ifwitool.c
index b25db4f099..591f588c59 100644
--- a/util/cbfstool/ifwitool.c
+++ b/util/cbfstool/ifwitool.c
@@ -1,8 +1,5 @@
+/* ifwitool, CLI utility for IFWI manipulation */
/*
- * ifwitool, CLI utility for IFWI manipulation
- *
- * Copyright 2016 Google Inc.
- *
* 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.
diff --git a/util/cbfstool/linux.h b/util/cbfstool/linux.h
index 4bba6f0d5e..c8281f752c 100644
--- a/util/cbfstool/linux.h
+++ b/util/cbfstool/linux.h
@@ -1,6 +1,5 @@
+/* This file is part of coreboot */
/*
- * This file is part of coreboot..
- *
* 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.
diff --git a/util/cbfstool/linux_trampoline.S b/util/cbfstool/linux_trampoline.S
index 3b4e730b33..fd21475bbe 100644
--- a/util/cbfstool/linux_trampoline.S
+++ b/util/cbfstool/linux_trampoline.S
@@ -1,8 +1,5 @@
+/* linux_trampoline */
/*
- * linux_trampoline
- *
- * Copyright (C) 2013 Patrick Georgi <patrick@georgi-clan.de>
- *
* 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.
diff --git a/util/cbfstool/linux_trampoline.h b/util/cbfstool/linux_trampoline.h
index 7b4fad51c0..dcdcf081a4 100644
--- a/util/cbfstool/linux_trampoline.h
+++ b/util/cbfstool/linux_trampoline.h
@@ -1,9 +1,5 @@
+/* This file is part of coreboot */
/*
- * This file is part of coreboot..
- *
- * Based on work by Patrick Georgi <patrick@georgi-clan.de>
- * Copyright 2014 Curt Brune <curt@cumulusnetworks.com>
- *
* 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.
diff --git a/util/cbfstool/option.h b/util/cbfstool/option.h
index 9a25f5ac53..134238374c 100644
--- a/util/cbfstool/option.h
+++ b/util/cbfstool/option.h
@@ -1,8 +1,5 @@
+/* unsigned OPTION type */
/*
- * option.h, unsigned OPTION type
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/partitioned_file.c b/util/cbfstool/partitioned_file.c
index a2d9ddfee2..917341c1f9 100644
--- a/util/cbfstool/partitioned_file.c
+++ b/util/cbfstool/partitioned_file.c
@@ -1,8 +1,5 @@
+/* read and write binary file "partitions" described by FMAP */
/*
- * partitioned_file.c, read and write binary file "partitions" described by FMAP
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/partitioned_file.h b/util/cbfstool/partitioned_file.h
index 5a8f4dd5af..75d51e062f 100644
--- a/util/cbfstool/partitioned_file.h
+++ b/util/cbfstool/partitioned_file.h
@@ -1,8 +1,5 @@
+/* read and write binary file "partitions" described by FMAP */
/*
- * partitioned_file.h, read and write binary file "partitions" described by FMAP
- *
- * Copyright (C) 2015 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/rmodtool.c b/util/cbfstool/rmodtool.c
index bbcc2aebb0..90af3af545 100644
--- a/util/cbfstool/rmodtool.c
+++ b/util/cbfstool/rmodtool.c
@@ -1,8 +1,5 @@
+/* CLI utility for creating rmodules */
/*
- * cbfstool, CLI utility for creating rmodules
- *
- * Copyright (C) 2014 Google, Inc.
- *
* 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.
diff --git a/util/cbfstool/rmodule.c b/util/cbfstool/rmodule.c
index 1d087b1658..800a85b9d8 100644
--- a/util/cbfstool/rmodule.c
+++ b/util/cbfstool/rmodule.c
@@ -1,7 +1,4 @@
/*
- * Copyright (C) 2014 Google, Inc.
- * Copyright (C) 2018 Eltan B.V.
- *
* 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.
diff --git a/util/cbfstool/rmodule.h b/util/cbfstool/rmodule.h
index abd8c027ac..7b29194295 100644
--- a/util/cbfstool/rmodule.h
+++ b/util/cbfstool/rmodule.h
@@ -1,7 +1,4 @@
/*
- * Copyright (C) 2014 Google, Inc.
- * Copyright (C) 2018 Eltan B.V.
- *
* 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.
diff --git a/util/cbfstool/xdr.c b/util/cbfstool/xdr.c
index 06cc91f409..d7bcb32c17 100644
--- a/util/cbfstool/xdr.c
+++ b/util/cbfstool/xdr.c
@@ -1,8 +1,4 @@
- /*
- * cbfstool, CLI utility for CBFS file manipulation
- *
- * Copyright 2013 Google Inc.
- *
+/*
* 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.
diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
index 56445d8ad5..5cc55a3a60 100644
--- a/util/cbmem/Makefile
+++ b/util/cbmem/Makefile
@@ -1,8 +1,5 @@
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2012 The ChromiumOS Authors. All rights reserved.
-##
## 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.
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 24a9b5416a..54642da99c 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -1,8 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright 2012 Google Inc.
- * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering
- *
* 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.
diff --git a/util/chromeos/crosfirmware.sh b/util/chromeos/crosfirmware.sh
index 5fec96b485..0dcb449cab 100755
--- a/util/chromeos/crosfirmware.sh
+++ b/util/chromeos/crosfirmware.sh
@@ -1,9 +1,6 @@
#!/usr/bin/env bash
-#
# This file is part of the coreboot project.
#
-# Copyright (C) 2016 Joe Pillow
-#
# 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.
diff --git a/util/chromeos/extract_blobs.sh b/util/chromeos/extract_blobs.sh
index a674ada91f..ca5c932a11 100755
--- a/util/chromeos/extract_blobs.sh
+++ b/util/chromeos/extract_blobs.sh
@@ -1,9 +1,6 @@
#!/usr/bin/env bash
-#
# This file is part of the coreboot project.
#
-# Copyright (C) 2016 Joe Pillow
-#
# 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.
diff --git a/util/chromeos/gen_test_hwid.sh b/util/chromeos/gen_test_hwid.sh
index 849ff6a8c0..6e7cdeebb5 100755
--- a/util/chromeos/gen_test_hwid.sh
+++ b/util/chromeos/gen_test_hwid.sh
@@ -1,9 +1,6 @@
#!/bin/sh
-#
# This file is part of the coreboot project.
#
-# Copyright 2019 Google Inc.
-#
# 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.
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.inc
index ed8d66e410..c6e468b887 100644
--- a/util/crossgcc/Makefile.inc
+++ b/util/crossgcc/Makefile.inc
@@ -1,8 +1,5 @@
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2016 Google Inc.
-##
## 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.
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 150e616652..2e354627cb 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -12,12 +12,6 @@
# This is used for all of our color printing.
#
-# Copyright (C) 2008-2010 by coresystems GmbH
-# written by Patrick Georgi <patrick.georgi@coresystems.de> and
-# Stefan Reinauer <stefan.reinauer@coresystems.de>
-#
-# Copyright (C) 2011 by Sage Electronic Engineering
-#
# 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.
diff --git a/util/docker/Makefile b/util/docker/Makefile
index 808a1d7ae5..c3b8fd65f8 100644
--- a/util/docker/Makefile
+++ b/util/docker/Makefile
@@ -1,8 +1,5 @@
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2016 Google, Inc.
-##
## 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.
diff --git a/util/docker/coreboot.org-status/kconfig2html b/util/docker/coreboot.org-status/kconfig2html
index 35386b14cb..250b3452cf 100755
--- a/util/docker/coreboot.org-status/kconfig2html
+++ b/util/docker/coreboot.org-status/kconfig2html
@@ -2,10 +2,7 @@
#
# kconfig2wiki - Kconfig to MediaWiki converter for
# https://www.coreboot.org/coreboot_Options
-#
-# Copyright (C) 2010 coresystems GmbH
# based on http://landley.net/kdocs/make/menuconfig2html.py
-# Copyright (C) by Rob Landley
#
# 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/docker/coreboot.org-status/run.sh b/util/docker/coreboot.org-status/run.sh
index 08732e7372..8f48f87b35 100755
--- a/util/docker/coreboot.org-status/run.sh
+++ b/util/docker/coreboot.org-status/run.sh
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2018 Google Inc.
-#
# 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.
diff --git a/util/dtd_parser/dtd_parser.py b/util/dtd_parser/dtd_parser.py
index 68045cbc49..d00d52128c 100755
--- a/util/dtd_parser/dtd_parser.py
+++ b/util/dtd_parser/dtd_parser.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python2
# dtd_parser.py - DTD structure parser
#
-# Copyright (C) 2012 The ChromiumOS Authors. All rights reserved.
-#
# 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
diff --git a/util/ectool/Makefile b/util/ectool/Makefile
index fdda265064..c2ba7639b7 100644
--- a/util/ectool/Makefile
+++ b/util/ectool/Makefile
@@ -1,9 +1,3 @@
-##
-## Makefile for ectool
-##
-## Copyright (C) 2009 by coresystems GmbH
-## written by Stefan Reinauer <stepan@coresystems.de>
-##
## 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.
diff --git a/util/exynos/fixed_cksum.py b/util/exynos/fixed_cksum.py
index 6679862160..7e95465f39 100755
--- a/util/exynos/fixed_cksum.py
+++ b/util/exynos/fixed_cksum.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python2
#
-# Copyright (C) 2013 Google Inc.
-#
# 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/exynos/variable_cksum.py b/util/exynos/variable_cksum.py
index 9725261aa5..05e2d00c12 100755
--- a/util/exynos/variable_cksum.py
+++ b/util/exynos/variable_cksum.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python2
#
-# Copyright (C) 2013 Google Inc.
-#
# 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/find_usbdebug/find_usbdebug.sh b/util/find_usbdebug/find_usbdebug.sh
index c7b2e7e8da..28d02ad2b0 100755
--- a/util/find_usbdebug/find_usbdebug.sh
+++ b/util/find_usbdebug/find_usbdebug.sh
@@ -1,8 +1,5 @@
#!/bin/bash
-# Copyright 2008 Carl-Daniel Hailfinger
-# Copyright 2015 Stefan Tauner
-#
# 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.
diff --git a/util/fuzz-tests/jpeg-test.c b/util/fuzz-tests/jpeg-test.c
index 0f9a925d06..82d6d5cdd3 100644
--- a/util/fuzz-tests/jpeg-test.c
+++ b/util/fuzz-tests/jpeg-test.c
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright 2015 Google Inc.
- *
* 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.
diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh
index 8da68ba445..e770425489 100755
--- a/util/genbuild_h/genbuild_h.sh
+++ b/util/genbuild_h/genbuild_h.sh
@@ -1,9 +1,6 @@
#!/bin/sh
-
# This file is part of the coreboot project.
#
-# Copyright (C) 2014 Sage Electronic Engineering, LLC.
-#
# 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.
diff --git a/util/gitconfig/commit-msg b/util/gitconfig/commit-msg
index ba6fa3ffb6..f0c0b659e2 100755
--- a/util/gitconfig/commit-msg
+++ b/util/gitconfig/commit-msg
@@ -1,9 +1,6 @@
#!/bin/sh
-#
# Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
#
-# Copyright (C) 2009 The Android Open Source Project
-#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
diff --git a/util/gitconfig/gitconfig.sh b/util/gitconfig/gitconfig.sh
index 4df93cf2c5..e287658a47 100755
--- a/util/gitconfig/gitconfig.sh
+++ b/util/gitconfig/gitconfig.sh
@@ -1,10 +1,6 @@
#!/usr/bin/env bash
-
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2011 secunet Security Networks AG
-##
## 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.
diff --git a/util/gitconfig/pre-commit b/util/gitconfig/pre-commit
index 78b2509eba..2dcdcb1930 100755
--- a/util/gitconfig/pre-commit
+++ b/util/gitconfig/pre-commit
@@ -1,10 +1,6 @@
#!/bin/sh
-
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2015 Patrick Georgi <patrick@georgi-clan.de>
-##
## 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.
diff --git a/util/gitconfig/test/commit-message-hook.sh b/util/gitconfig/test/commit-message-hook.sh
index a2c53eccde..7642746441 100755
--- a/util/gitconfig/test/commit-message-hook.sh
+++ b/util/gitconfig/test/commit-message-hook.sh
@@ -1,10 +1,6 @@
#!/bin/bash
-
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2003-2018 Alex Thiessen <alex.thiessen.de+coreboot@gmail.com>
-##
## 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 3 or later of the License.
diff --git a/util/gitconfig/test/helpers.sh b/util/gitconfig/test/helpers.sh
index 0d4b3c8e21..31e39130b6 100644
--- a/util/gitconfig/test/helpers.sh
+++ b/util/gitconfig/test/helpers.sh
@@ -1,10 +1,6 @@
#!/bin/bash
-
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2003-2018 Alex Thiessen <alex.thiessen.de+coreboot@gmail.com>
-##
## 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 3 or later of the License.
diff --git a/util/gitconfig/test/timeout.sh b/util/gitconfig/test/timeout.sh
index 5e2164f811..f404a656f8 100755
--- a/util/gitconfig/test/timeout.sh
+++ b/util/gitconfig/test/timeout.sh
@@ -1,10 +1,6 @@
#!/bin/bash
-
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2003-2018 Alex Thiessen <alex.thiessen.de+coreboot@gmail.com>
-##
## 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 3 or later of the License.
diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile
index 50c6c30650..8ebc6672ac 100644
--- a/util/ifdtool/Makefile
+++ b/util/ifdtool/Makefile
@@ -1,8 +1,5 @@
-#
# ifdtool - dump Intel Firmware Descriptor information
#
-# Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
-#
# 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.
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 97b9cd1fe8..08a65b3ff5 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -1,8 +1,5 @@
+/* ifdtool - dump Intel Firmware Descriptor information */
/*
- * ifdtool - dump Intel Firmware Descriptor information
- *
- * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
- *
* 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.
diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h
index aecd8fa643..0b81260006 100644
--- a/util/ifdtool/ifdtool.h
+++ b/util/ifdtool/ifdtool.h
@@ -1,8 +1,5 @@
+/* ifdtool - dump Intel Firmware Descriptor information */
/*
- * ifdtool - dump Intel Firmware Descriptor information
- *
- * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
- *
* 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.
diff --git a/util/intelmetool/Makefile b/util/intelmetool/Makefile
index 55ba82a424..4bf3c345e2 100644
--- a/util/intelmetool/Makefile
+++ b/util/intelmetool/Makefile
@@ -1,7 +1,5 @@
# intelmetool
-# Copyright (C) 2013-2015 Damien Zammit <damien@zamaudio.com>
-
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
diff --git a/util/intelmetool/intelmetool.c b/util/intelmetool/intelmetool.c
index 37cd357a8c..5d8523881f 100644
--- a/util/intelmetool/intelmetool.c
+++ b/util/intelmetool/intelmetool.c
@@ -1,6 +1,5 @@
-/* intelmetool Dump interesting things about Management Engine even if hidden
- * Copyright (C) 2014 Damien Zammit <damien@zamaudio.com>
- *
+/* intelmetool Dump interesting things about Management Engine even if hidden */
+/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License,
diff --git a/util/intelmetool/intelmetool.h b/util/intelmetool/intelmetool.h
index 27bf46dde2..f3dbcee189 100644
--- a/util/intelmetool/intelmetool.h
+++ b/util/intelmetool/intelmetool.h
@@ -1,10 +1,4 @@
/*
- * intelmetool
- *
- * Copyright (C) 2008-2010 by coresystems GmbH
- * Copyright (C) 2009 Carl-Daniel Hailfinger
- * Copyright (C) 2015-2019 Damien Zammit
- *
* 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.
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile
index bc6bcb3e38..75daef0cef 100644
--- a/util/inteltool/Makefile
+++ b/util/inteltool/Makefile
@@ -1,9 +1,3 @@
-#
-# Makefile for inteltool utility
-#
-# Copyright (C) 2008 by coresystems GmbH
-# written by Stefan Reinauer <stepan@coresystems.de>
-#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
diff --git a/util/inteltool/amb.c b/util/inteltool/amb.c
index 506ba5fa0f..67b5d8f814 100644
--- a/util/inteltool/amb.c
+++ b/util/inteltool/amb.c
@@ -1,8 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2012 Sven Schnelle <svens@stackframe.org>
- *
* 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.
diff --git a/util/inteltool/cpu.c b/util/inteltool/cpu.c
index e322e81028..f142455809 100644
--- a/util/inteltool/cpu.c
+++ b/util/inteltool/cpu.c
@@ -1,8 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008-2010 by coresystems GmbH
- *
* 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.
diff --git a/util/inteltool/gfx.c b/util/inteltool/gfx.c
index 083e6c397d..e19f58ba5a 100644
--- a/util/inteltool/gfx.c
+++ b/util/inteltool/gfx.c
@@ -1,9 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008-2010 by coresystems GmbH
- * Copyright (C) 2012 Anton Kochkov
- *
* 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.
diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 01b187f731..692876445a 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -1,8 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008 by coresystems GmbH
- *
* 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.
diff --git a/util/inteltool/gpio_groups.c b/util/inteltool/gpio_groups.c
index bb196a914e..6f65f6d74f 100644
--- a/util/inteltool/gpio_groups.c
+++ b/util/inteltool/gpio_groups.c
@@ -1,9 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2017 secunet Security Networks AG
- * Copyright (C) 2019 YADRO
- *
* 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.
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index 8d5d9942a7..12f8c6af68 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -1,11 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008-2010 by coresystems GmbH
- * written by Stefan Reinauer <stepan@coresystems.de>
- * Copyright (C) 2009 Carl-Daniel Hailfinger
- * Copyright (C) 2017 secunet Security Networks AG
- *
* 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.
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 0b1b476410..ba46887d9a 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -1,9 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008-2010 by coresystems GmbH
- * Copyright (C) 2009 Carl-Daniel Hailfinger
- *
* 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.
diff --git a/util/inteltool/ivy_memory.c b/util/inteltool/ivy_memory.c
index 16c1d8920c..2893c70121 100644
--- a/util/inteltool/ivy_memory.c
+++ b/util/inteltool/ivy_memory.c
@@ -1,6 +1,4 @@
/*
- * Copyright (C) 2014 Vladimir Serbinenko
- *
* 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 or (at your option) any later version of the License.
diff --git a/util/inteltool/lpc.c b/util/inteltool/lpc.c
index 247c37acb9..068ad037b6 100644
--- a/util/inteltool/lpc.c
+++ b/util/inteltool/lpc.c
@@ -1,11 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008-2010 by coresystems GmbH
- * written by Stefan Reinauer <stepan@coresystems.de>
- * Copyright (C) 2017 secunet Security Networks AG
- * Copyright (C) 2020 Michael Niewöhner <foss@mniewoehner.de>
- *
* 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.
diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c
index f5f3f94fd4..59b94ff050 100644
--- a/util/inteltool/memory.c
+++ b/util/inteltool/memory.c
@@ -1,8 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system. */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008-2010 by coresystems GmbH
- *
* 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.
diff --git a/util/inteltool/pcie.c b/util/inteltool/pcie.c
index 38ef61f1d8..837afdd82f 100644
--- a/util/inteltool/pcie.c
+++ b/util/inteltool/pcie.c
@@ -1,9 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008-2010 by coresystems GmbH
- * Copyright (C) 2012 Anton Kochkov
- *
* 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.
diff --git a/util/inteltool/pcr.c b/util/inteltool/pcr.c
index 8131fdd6a7..231a61db7d 100644
--- a/util/inteltool/pcr.c
+++ b/util/inteltool/pcr.c
@@ -1,8 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2017 secunet Security Networks AG
- *
* 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.
diff --git a/util/inteltool/pcr.h b/util/inteltool/pcr.h
index 4c272ff3a4..69826c3f29 100644
--- a/util/inteltool/pcr.h
+++ b/util/inteltool/pcr.h
@@ -1,8 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2017 secunet Security Networks AG
- *
* 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.
diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c
index 0edd3e8d6d..a7a2035b00 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -1,10 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008-2010 by coresystems GmbH
- * written by Stefan Reinauer <stepan@coresystems.de>
- * Copyright (C) 2017 secunet Security Networks AG
- *
* 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.
diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c
index 8aa959b174..6758c669ff 100644
--- a/util/inteltool/rootcmplx.c
+++ b/util/inteltool/rootcmplx.c
@@ -1,9 +1,5 @@
+/* inteltool - dump all registers on an Intel CPU + chipset based system */
/*
- * inteltool - dump all registers on an Intel CPU + chipset based system.
- *
- * Copyright (C) 2008 by coresystems GmbH
- * written by Stefan Reinauer <stepan@coresystems.de>
- *
* 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.
diff --git a/util/intelvbttool/Makefile b/util/intelvbttool/Makefile
index 57f2627e49..34f4254833 100644
--- a/util/intelvbttool/Makefile
+++ b/util/intelvbttool/Makefile
@@ -1,8 +1,5 @@
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2012 The ChromiumOS Authors. All rights reserved.
-##
## 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.
diff --git a/util/intelvbttool/intelvbttool.c b/util/intelvbttool/intelvbttool.c
index 2dfa0023f2..b98d6e4408 100644
--- a/util/intelvbttool/intelvbttool.c
+++ b/util/intelvbttool/intelvbttool.c
@@ -1,6 +1,4 @@
/*
- * Copyright (C) 2014 Vladimir Serbinenko
- *
* 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.
diff --git a/util/kbc1126/kbc1126_ec_dump.c b/util/kbc1126/kbc1126_ec_dump.c
index 6122449fef..a96464a76f 100644
--- a/util/kbc1126/kbc1126_ec_dump.c
+++ b/util/kbc1126/kbc1126_ec_dump.c
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2017 Iru Cai <mytbk920423@gmail.com>
- *
* 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.
diff --git a/util/kbc1126/kbc1126_ec_insert.c b/util/kbc1126/kbc1126_ec_insert.c
index f582954c0d..cc86b773d4 100644
--- a/util/kbc1126/kbc1126_ec_insert.c
+++ b/util/kbc1126/kbc1126_ec_insert.c
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2017 Iru Cai <mytbk920423@gmail.com>
- *
* 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.
diff --git a/util/kconfig/toada.c b/util/kconfig/toada.c
index 9a11b04498..9db4dc71ff 100644
--- a/util/kconfig/toada.c
+++ b/util/kconfig/toada.c
@@ -1,6 +1,5 @@
+/* This file is part of the coreboot project. */
/*
- * 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
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/lint/checkpatch_json.py b/util/lint/checkpatch_json.py
index c8dd36df44..827d2f5361 100755
--- a/util/lint/checkpatch_json.py
+++ b/util/lint/checkpatch_json.py
@@ -1,8 +1,4 @@
#!/usr/bin/env python2
-# Copyright (C) 2018 Intel Corporation.
-# written by Naresh G Solanki<naresh.solanki@intel.com> and
-# Maulik V Vaghela <maulik.v.vaghela@intel.com>
-#
# 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.
diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint
index 16188bacc5..bdf9b8bb16 100755
--- a/util/lint/kconfig_lint
+++ b/util/lint/kconfig_lint
@@ -1,11 +1,6 @@
#!/usr/bin/env perl
-
-#
# This file is part of the coreboot project.
#
-# Copyright (C) 2015 Martin L Roth <gaumless@gmail.com>
-# Copyright (C) 2015-2016 Google, Inc.
-#
# 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.
diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers
index c1110ec75d..080e6de99c 100755
--- a/util/lint/lint-000-license-headers
+++ b/util/lint/lint-000-license-headers
@@ -1,9 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2010 coresystems GmbH
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-001-no-global-config-in-romstage b/util/lint/lint-001-no-global-config-in-romstage
index e51e8ddf08..29c9db1067 100755
--- a/util/lint/lint-001-no-global-config-in-romstage
+++ b/util/lint/lint-001-no-global-config-in-romstage
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2010 coresystems GmbH
-#
# 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.
diff --git a/util/lint/lint-007-checkpatch b/util/lint/lint-007-checkpatch
index a7b63e8d7c..77c3907b20 100755
--- a/util/lint/lint-007-checkpatch
+++ b/util/lint/lint-007-checkpatch
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright 2015 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-008-kconfig b/util/lint/lint-008-kconfig
index 8a0042d2da..79f7146957 100755
--- a/util/lint/lint-008-kconfig
+++ b/util/lint/lint-008-kconfig
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-014-qualified-types b/util/lint/lint-014-qualified-types
index d447c4bd6d..7c0409c808 100755
--- a/util/lint/lint-014-qualified-types
+++ b/util/lint/lint-014-qualified-types
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-extended-007-checkpatch b/util/lint/lint-extended-007-checkpatch
index c221d4a9f4..80c1af5d1d 100755
--- a/util/lint/lint-extended-007-checkpatch
+++ b/util/lint/lint-extended-007-checkpatch
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-extended-015-final-newlines b/util/lint/lint-extended-015-final-newlines
index ee573f516f..4e72995a46 100755
--- a/util/lint/lint-extended-015-final-newlines
+++ b/util/lint/lint-extended-015-final-newlines
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-extended-020-signed-off-by b/util/lint/lint-extended-020-signed-off-by
index 065b286d34..7700b3a52f 100755
--- a/util/lint/lint-extended-020-signed-off-by
+++ b/util/lint/lint-extended-020-signed-off-by
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright 2016 Google Inc.
-#
# 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, or (at your option)
diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace
index b2011e7f65..7943fcc411 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2011 Patrick Georgi <patrick@georgi-clan.de>
-#
# 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.
diff --git a/util/lint/lint-stable-004-style-labels b/util/lint/lint-stable-004-style-labels
index 698b22df78..c952b9102b 100755
--- a/util/lint/lint-stable-004-style-labels
+++ b/util/lint/lint-stable-004-style-labels
@@ -1,9 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2012 Patrick Georgi <patrick@georgi-clan.de>
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-005-board-status b/util/lint/lint-stable-005-board-status
index 952a9b5c6f..edaa0b76c2 100755
--- a/util/lint/lint-stable-005-board-status
+++ b/util/lint/lint-stable-005-board-status
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2014 Vladimir Serbinenko <phcoder@gmail.com>
-#
# 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, or (at your option)
diff --git a/util/lint/lint-stable-006-board-name b/util/lint/lint-stable-006-board-name
index b2418a1472..1458c8b5a8 100755
--- a/util/lint/lint-stable-006-board-name
+++ b/util/lint/lint-stable-006-board-name
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright 2015 Google Inc.
-#
# 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, or (at your option)
diff --git a/util/lint/lint-stable-008-kconfig b/util/lint/lint-stable-008-kconfig
index 25d04b6c7c..778a7a57a8 100755
--- a/util/lint/lint-stable-008-kconfig
+++ b/util/lint/lint-stable-008-kconfig
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-009-old-licenses b/util/lint/lint-stable-009-old-licenses
index 6e6dc1cb61..369d3936f1 100755
--- a/util/lint/lint-stable-009-old-licenses
+++ b/util/lint/lint-stable-009-old-licenses
@@ -1,9 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2010 coresystems GmbH
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-010-asm-syntax b/util/lint/lint-stable-010-asm-syntax
index a102a774bc..d532c5d28c 100755
--- a/util/lint/lint-stable-010-asm-syntax
+++ b/util/lint/lint-stable-010-asm-syntax
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-012-executable-bit b/util/lint/lint-stable-012-executable-bit
index e7ff3cb64b..5827a59b1f 100755
--- a/util/lint/lint-stable-012-executable-bit
+++ b/util/lint/lint-stable-012-executable-bit
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright 2016 Google Inc.
-#
# 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, or (at your option)
diff --git a/util/lint/lint-stable-013-site-local b/util/lint/lint-stable-013-site-local
index d701ee07b3..af660ab9c4 100755
--- a/util/lint/lint-stable-013-site-local
+++ b/util/lint/lint-stable-013-site-local
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright 2016 Google Inc.
-#
# 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, or (at your option)
diff --git a/util/lint/lint-stable-016-non-ascii b/util/lint/lint-stable-016-non-ascii
index fbb830d3be..a9967cab2c 100755
--- a/util/lint/lint-stable-016-non-ascii
+++ b/util/lint/lint-stable-016-non-ascii
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-017-configs b/util/lint/lint-stable-017-configs
index 6d7393db81..01d32b1280 100755
--- a/util/lint/lint-stable-017-configs
+++ b/util/lint/lint-stable-017-configs
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-018-symlinks b/util/lint/lint-stable-018-symlinks
index 6f58e7ddd0..eddcb0579c 100755
--- a/util/lint/lint-stable-018-symlinks
+++ b/util/lint/lint-stable-018-symlinks
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-019-header-files b/util/lint/lint-stable-019-header-files
index 11bc432679..6940227c07 100755
--- a/util/lint/lint-stable-019-header-files
+++ b/util/lint/lint-stable-019-header-files
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2016 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-021-coreboot-lowercase b/util/lint/lint-stable-021-coreboot-lowercase
index a71d2047f3..6c6a56b60a 100755
--- a/util/lint/lint-stable-021-coreboot-lowercase
+++ b/util/lint/lint-stable-021-coreboot-lowercase
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2017 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-022-clang-format b/util/lint/lint-stable-022-clang-format
index 48f51a8e77..fb9388b67a 100755
--- a/util/lint/lint-stable-022-clang-format
+++ b/util/lint/lint-stable-022-clang-format
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2018 Google Inc.
-#
# 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.
diff --git a/util/lint/lint-stable-023-filenames b/util/lint/lint-stable-023-filenames
index aa7b0906b7..6332d2e9a2 100755
--- a/util/lint/lint-stable-023-filenames
+++ b/util/lint/lint-stable-023-filenames
@@ -1,8 +1,6 @@
#!/bin/sh
# This file is part of the coreboot project.
#
-# Copyright (C) 2018 Google LLC
-#
# 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.
diff --git a/util/mainboard/google/volteer/template/Makefile.inc b/util/mainboard/google/volteer/template/Makefile.inc
index f130808dfa..38cf728d8f 100644
--- a/util/mainboard/google/volteer/template/Makefile.inc
+++ b/util/mainboard/google/volteer/template/Makefile.inc
@@ -1,8 +1,5 @@
-##
## This file is part of the coreboot project.
##
-## Copyright 2020 Google LLC
-##
## 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.
diff --git a/util/mainboard/google/volteer/template/include/variant/ec.h b/util/mainboard/google/volteer/template/include/variant/ec.h
index 5d3278f445..e6c68afc10 100644
--- a/util/mainboard/google/volteer/template/include/variant/ec.h
+++ b/util/mainboard/google/volteer/template/include/variant/ec.h
@@ -1,8 +1,5 @@
+/* This file is part of the coreboot project. */
/*
- * This file is part of the coreboot project.
- *
- * Copyright 2020 Google LLC
- *
* 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.
diff --git a/util/mainboard/google/volteer/template/include/variant/gpio.h b/util/mainboard/google/volteer/template/include/variant/gpio.h
index ad4d68bfd1..122f7a434a 100644
--- a/util/mainboard/google/volteer/template/include/variant/gpio.h
+++ b/util/mainboard/google/volteer/template/include/variant/gpio.h
@@ -1,8 +1,5 @@
+/* This file is part of the coreboot project. */
/*
- * This file is part of the coreboot project.
- *
- * Copyright 2020 Google LLC
- *
* 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.
diff --git a/util/me_cleaner/me_cleaner.py b/util/me_cleaner/me_cleaner.py
index f592863f80..d921fd9b16 100755
--- a/util/me_cleaner/me_cleaner.py
+++ b/util/me_cleaner/me_cleaner.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
-
# me_cleaner - Tool for partial deblobbing of Intel ME/TXE firmware images
-# Copyright (C) 2016-2018 Nicola Corna <nicola@corna.info>
#
# 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.conf b/util/mma/mma.conf
index 29c1f220d0..917b42a7e2 100644
--- a/util/mma/mma.conf
+++ b/util/mma/mma.conf
@@ -1,4 +1,3 @@
-# Copyright (c) 2015 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/util/mma/mma_automated_test.sh b/util/mma/mma_automated_test.sh
index 1c324f34ad..81ec812e05 100755
--- a/util/mma/mma_automated_test.sh
+++ b/util/mma/mma_automated_test.sh
@@ -1,10 +1,6 @@
#!/usr/bin/env bash
-
-#
# This file is part of the coreboot project.
#
-# Copyright (C) 2015 Intel Corporation.
-#
# 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.
diff --git a/util/mma/mma_get_result.sh b/util/mma/mma_get_result.sh
index f797e7f36b..890ee74193 100755
--- a/util/mma/mma_get_result.sh
+++ b/util/mma/mma_get_result.sh
@@ -1,10 +1,6 @@
#!/usr/bin/env bash
-
-#
# This file is part of the coreboot project.
#
-# Copyright (C) 2015 Intel Corporation.
-#
# 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.
diff --git a/util/mma/mma_setup_test.sh b/util/mma/mma_setup_test.sh
index b2a0de92bc..a53905b5aa 100755
--- a/util/mma/mma_setup_test.sh
+++ b/util/mma/mma_setup_test.sh
@@ -1,10 +1,6 @@
#!/usr/bin/env bash
-
-#
# This file is part of the coreboot project.
#
-# Copyright (C) 2017 Intel Corporation.
-#
# 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.
diff --git a/util/mtkheader/gen-bl-img.py b/util/mtkheader/gen-bl-img.py
index 983923d2b6..656b976223 100755
--- a/util/mtkheader/gen-bl-img.py
+++ b/util/mtkheader/gen-bl-img.py
@@ -1,11 +1,6 @@
#!/usr/bin/env python2
-
-#
# This file is part of the coreboot project.
#
-# Copyright (c) 2015 MediaTek Inc.
-# Author: Tristan Shieh <tristan.shieh@mediatek.com>
-#
# 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.
diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c
index baada2706a..6bb5da13e1 100644
--- a/util/nvramtool/accessors/layout-bin.c
+++ b/util/nvramtool/accessors/layout-bin.c
@@ -1,19 +1,6 @@
/*****************************************************************************\
* lbtable.c
*****************************************************************************
- * Copyright (C) 2012, Vikram Narayanan
- * Unified build_opt_tbl and nvramtool
- * build_opt_tbl.c
- * Copyright (C) 2003 Eric Biederman (ebiederm@xmission.com)
- * Copyright (C) 2007-2010 coresystems GmbH
- *
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>
- * and Stefan Reinauer <stepan@openbios.org>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/accessors/layout-common.c b/util/nvramtool/accessors/layout-common.c
index 33522f4088..15a2672726 100644
--- a/util/nvramtool/accessors/layout-common.c
+++ b/util/nvramtool/accessors/layout-common.c
@@ -1,12 +1,6 @@
/*****************************************************************************\
* layout_common.c
*****************************************************************************
- * Copyright (C) 2012, Vikram Narayanan
- * Unified build_opt_tbl and nvramtool
- * build_opt_tbl.c
- * Copyright (C) 2003 Eric Biederman (ebiederm@xmission.com)
- * Copyright (C) 2007-2010 coresystems GmbH
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/accessors/layout-text.c b/util/nvramtool/accessors/layout-text.c
index 7bcfb93d91..75b2ee84ad 100644
--- a/util/nvramtool/accessors/layout-text.c
+++ b/util/nvramtool/accessors/layout-text.c
@@ -1,18 +1,6 @@
/*****************************************************************************\
* layout-text.c
*****************************************************************************
- * Copyright (C) 2012, Vikram Narayanan
- * Unified build_opt_tbl and nvramtool
- * build_opt_tbl.c
- * Copyright (C) 2003 Eric Biederman (ebiederm@xmission.com)
- * Copyright (C) 2007-2010 coresystems GmbH
- *
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/accessors/layout-text.h b/util/nvramtool/accessors/layout-text.h
index abbd414964..2074642611 100644
--- a/util/nvramtool/accessors/layout-text.h
+++ b/util/nvramtool/accessors/layout-text.h
@@ -1,12 +1,6 @@
/*****************************************************************************\
* layout_file.h
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/cbfs.c b/util/nvramtool/cbfs.c
index 67568fa7e9..86b5f5984d 100644
--- a/util/nvramtool/cbfs.c
+++ b/util/nvramtool/cbfs.c
@@ -1,9 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
- * Copyright (C) 2011 secunet Security Networks AG
- * (Written by Patrick Georgi <patrick.georgi@secunet.com>)
- *
* 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.
diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h
index 679f5e43ba..acf359e972 100644
--- a/util/nvramtool/cbfs.h
+++ b/util/nvramtool/cbfs.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
- *
* 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)
diff --git a/util/nvramtool/cli/nvramtool.8 b/util/nvramtool/cli/nvramtool.8
index 263bbb8cdb..12f92ac26b 100644
--- a/util/nvramtool/cli/nvramtool.8
+++ b/util/nvramtool/cli/nvramtool.8
@@ -1,12 +1,6 @@
.\"***************************************************************************\
.\" nvramtool.8
.\"***************************************************************************
-.\" Copyright (C) 2002, 2003 The Regents of the University of California.
-.\" Produced at the Lawrence Livermore National Laboratory.
-.\" Written by David S. Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
-.\" UCRL-CODE-2003-012
-.\" All rights reserved.
-.\"
.\" This file is part of nvramtool, a utility for reading/writing coreboot
.\" parameters and displaying information from the coreboot table.
.\" For details, see https://www.coreboot.org/nvramtool.
diff --git a/util/nvramtool/cli/nvramtool.c b/util/nvramtool/cli/nvramtool.c
index 7f3f468984..c6d4d9c066 100644
--- a/util/nvramtool/cli/nvramtool.c
+++ b/util/nvramtool/cli/nvramtool.c
@@ -1,12 +1,6 @@
/*****************************************************************************\
* nvramtool.c
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/cli/opts.c b/util/nvramtool/cli/opts.c
index d4ea9ce3f5..5c40748f73 100644
--- a/util/nvramtool/cli/opts.c
+++ b/util/nvramtool/cli/opts.c
@@ -1,12 +1,6 @@
/*****************************************************************************\
* opts.c
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/cli/opts.h b/util/nvramtool/cli/opts.h
index e6bd1f66a2..f04a3b0514 100644
--- a/util/nvramtool/cli/opts.h
+++ b/util/nvramtool/cli/opts.h
@@ -1,12 +1,6 @@
/*****************************************************************************\
* opts.h
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c
index 32406ecd1a..71206d2be4 100644
--- a/util/nvramtool/cmos_lowlevel.c
+++ b/util/nvramtool/cmos_lowlevel.c
@@ -1,12 +1,6 @@
/*****************************************************************************\
* cmos_lowlevel.c
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by David S. Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/cmos_lowlevel.h b/util/nvramtool/cmos_lowlevel.h
index 2b10ae3a04..5f18af2ea2 100644
--- a/util/nvramtool/cmos_lowlevel.h
+++ b/util/nvramtool/cmos_lowlevel.h
@@ -1,12 +1,6 @@
/*****************************************************************************\
* cmos_lowlevel.h
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by David S. Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/cmos_ops.c b/util/nvramtool/cmos_ops.c
index 45b6162a1f..db46f45345 100644
--- a/util/nvramtool/cmos_ops.c
+++ b/util/nvramtool/cmos_ops.c
@@ -1,12 +1,6 @@
/*****************************************************************************\
* cmos_ops.c
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by David S. Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/cmos_ops.h b/util/nvramtool/cmos_ops.h
index 12a11b6c96..3785633d07 100644
--- a/util/nvramtool/cmos_ops.h
+++ b/util/nvramtool/cmos_ops.h
@@ -1,12 +1,6 @@
/*****************************************************************************\
* cmos_ops.h
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by David S. Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/common.c b/util/nvramtool/common.c
index 5dfc3bd99c..388c7e1ffa 100644
--- a/util/nvramtool/common.c
+++ b/util/nvramtool/common.c
@@ -1,12 +1,6 @@
/*****************************************************************************\
* common.c
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h
index f49bc33831..dccebccc50 100644
--- a/util/nvramtool/common.h
+++ b/util/nvramtool/common.h
@@ -1,12 +1,6 @@
/*****************************************************************************\
* common.h
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/hexdump.c b/util/nvramtool/hexdump.c
index 4f0023dd73..29cbc34485 100644
--- a/util/nvramtool/hexdump.c
+++ b/util/nvramtool/hexdump.c
@@ -7,11 +7,6 @@
/* hexdump.c
*
- * Copyright (C) 2002
- * David S. Peterson. All rights reserved.
- *
- * Author: David S. Peterson <dave_peterson@pobox.com>
- *
* 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/nvramtool/hexdump.h b/util/nvramtool/hexdump.h
index 14c4bbfd4a..98dca51e54 100644
--- a/util/nvramtool/hexdump.h
+++ b/util/nvramtool/hexdump.h
@@ -7,11 +7,6 @@
/* hexdump.h
*
- * Copyright (C) 2002
- * David S. Peterson. All rights reserved.
- *
- * Author: David S. Peterson <dave_peterson@pobox.com>
- *
* 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/nvramtool/input_file.c b/util/nvramtool/input_file.c
index 730ea37c09..b683aee7ff 100644
--- a/util/nvramtool/input_file.c
+++ b/util/nvramtool/input_file.c
@@ -1,12 +1,6 @@
/*****************************************************************************\
* input_file.c
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by David S. Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/input_file.h b/util/nvramtool/input_file.h
index 0fce720f97..b55c65a852 100644
--- a/util/nvramtool/input_file.h
+++ b/util/nvramtool/input_file.h
@@ -1,12 +1,6 @@
/*****************************************************************************\
* input_file.h
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by David S. Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/layout.c b/util/nvramtool/layout.c
index 884a828934..8d8b53e8e1 100644
--- a/util/nvramtool/layout.c
+++ b/util/nvramtool/layout.c
@@ -1,12 +1,6 @@
/*****************************************************************************\
* layout.c
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/layout.h b/util/nvramtool/layout.h
index a75654b816..b2b51538db 100644
--- a/util/nvramtool/layout.h
+++ b/util/nvramtool/layout.h
@@ -1,12 +1,6 @@
/*****************************************************************************\
* layout.h
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c
index a9586c877d..cf01f7225f 100644
--- a/util/nvramtool/lbtable.c
+++ b/util/nvramtool/lbtable.c
@@ -1,13 +1,6 @@
/*****************************************************************************\
* lbtable.c
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>
- * and Stefan Reinauer <stepan@openbios.org>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/lbtable.h b/util/nvramtool/lbtable.h
index 60609a99b3..0c55f4cb46 100644
--- a/util/nvramtool/lbtable.h
+++ b/util/nvramtool/lbtable.h
@@ -1,12 +1,6 @@
/*****************************************************************************\
* lbtable.h
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/reg_expr.c b/util/nvramtool/reg_expr.c
index 5be80fcc03..30e8ecd967 100644
--- a/util/nvramtool/reg_expr.c
+++ b/util/nvramtool/reg_expr.c
@@ -1,12 +1,6 @@
/*****************************************************************************\
* reg_expr.c
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/nvramtool/reg_expr.h b/util/nvramtool/reg_expr.h
index 553c96a45d..cae2796e91 100644
--- a/util/nvramtool/reg_expr.h
+++ b/util/nvramtool/reg_expr.h
@@ -1,12 +1,6 @@
/*****************************************************************************\
* reg_expr.h
*****************************************************************************
- * Copyright (C) 2002-2005 The Regents of the University of California.
- * Produced at the Lawrence Livermore National Laboratory.
- * Written by Dave Peterson <dsp@llnl.gov> <dave_peterson@pobox.com>.
- * UCRL-CODE-2003-012
- * All rights reserved.
- *
* This file is part of nvramtool, a utility for reading/writing coreboot
* parameters and displaying information from the coreboot table.
* For details, see https://coreboot.org/nvramtool.
diff --git a/util/pmh7tool/Makefile b/util/pmh7tool/Makefile
index 034ed40c59..8572e00e51 100644
--- a/util/pmh7tool/Makefile
+++ b/util/pmh7tool/Makefile
@@ -1,8 +1,3 @@
-##
-## Makefile for pmh7tool
-##
-## Copyright (C) 2018 Evgeny Zinoviev <me@ch1p.com>
-##
## 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.
diff --git a/util/pmh7tool/pmh7tool.c b/util/pmh7tool/pmh7tool.c
index 9f2dc64b69..908abf394b 100644
--- a/util/pmh7tool/pmh7tool.c
+++ b/util/pmh7tool/pmh7tool.c
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2018 Evgeny Zinoviev <me@ch1p.com>
- *
* 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.
diff --git a/util/pmh7tool/pmh7tool.h b/util/pmh7tool/pmh7tool.h
index 9549bbdd08..34ccbc9f01 100644
--- a/util/pmh7tool/pmh7tool.h
+++ b/util/pmh7tool/pmh7tool.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2018 Evgeny Zinoviev <me@ch1p.com>
- *
* 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.
diff --git a/util/post/post.c b/util/post/post.c
index 6d67909f35..ef769161b1 100644
--- a/util/post/post.c
+++ b/util/post/post.c
@@ -1,6 +1,4 @@
/*
- * Copyright (C) 2016 Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/qualcomm/createxbl.py b/util/qualcomm/createxbl.py
index 65d8eb9460..6f01ffbdad 100755
--- a/util/qualcomm/createxbl.py
+++ b/util/qualcomm/createxbl.py
@@ -6,8 +6,6 @@
# GENERAL DESCRIPTION
# Concatentates XBL segments into one ELF image
#
-# Copyright (c) 2016, 2018, The Linux Foundation. All rights reserved.
-#
# 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/qualcomm/ipqheader.py b/util/qualcomm/ipqheader.py
index fe14e1f241..1003374fe5 100755
--- a/util/qualcomm/ipqheader.py
+++ b/util/qualcomm/ipqheader.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python3
#
-# Copyright (c) 2013 The Linux Foundation. All rights reserved.
-#
# 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/qualcomm/mbn_tools.py b/util/qualcomm/mbn_tools.py
index b89044ffb9..41904d0340 100755
--- a/util/qualcomm/mbn_tools.py
+++ b/util/qualcomm/mbn_tools.py
@@ -6,8 +6,6 @@
# GENERAL DESCRIPTION
# Contains all MBN Utilities for image generation
#
-# Copyright (c) 2016, 2018, The Linux Foundation. All rights reserved.
-#
# 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/release/genrelnotes b/util/release/genrelnotes
index d0f1a7ac1c..e972b40e4c 100755
--- a/util/release/genrelnotes
+++ b/util/release/genrelnotes
@@ -1,9 +1,6 @@
#!/usr/bin/env bash
-#
# This file is part of the coreboot project.
#
-# Copyright 2015-2016 Google Inc.
-#
# 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.
diff --git a/util/release/gerrit_stats.pl b/util/release/gerrit_stats.pl
index acd56226d5..9e2e71a260 100755
--- a/util/release/gerrit_stats.pl
+++ b/util/release/gerrit_stats.pl
@@ -1,10 +1,6 @@
#!/usr/bin/perl
-
-#
# This file is part of the coreboot project.
#
-# Copyright (C) 2015 Google, Inc.
-#
# 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.
diff --git a/util/riscv/sifive-gpt.py b/util/riscv/sifive-gpt.py
index f1e4fa85be..c651f021a9 100755
--- a/util/riscv/sifive-gpt.py
+++ b/util/riscv/sifive-gpt.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python3
# This file is part of the coreboot project.
#
-# Copyright (C) 2018 Jonathan Neuschäfer
-#
# 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.
diff --git a/util/rockchip/make_idb.py b/util/rockchip/make_idb.py
index 1ffb910eba..87d8e546ae 100755
--- a/util/rockchip/make_idb.py
+++ b/util/rockchip/make_idb.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python2
-# Copyright (c) 2014 Google Inc. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 186eedba43..036c59ce57 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -1,9 +1,5 @@
+/* sconfig, coreboot device tree compiler */
/*
- * sconfig, coreboot device tree compiler
- *
- * Copyright (C) 2010 coresystems GmbH
- * written by Patrick Georgi <patrick@georgi-clan.de>
- *
* 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.
diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h
index 2603904289..9f6e01c9e8 100644
--- a/util/sconfig/sconfig.h
+++ b/util/sconfig/sconfig.h
@@ -1,9 +1,5 @@
+/* sconfig, coreboot device tree compiler */
/*
- * sconfig, coreboot device tree compiler
- *
- * Copyright (C) 2010 coresystems GmbH
- * written by Patrick Georgi <patrick@georgi-clan.de>
- *
* 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.
diff --git a/util/sconfig/sconfig.l b/util/sconfig/sconfig.l
index 14eb965bdb..0c30d2cb70 100755
--- a/util/sconfig/sconfig.l
+++ b/util/sconfig/sconfig.l
@@ -1,10 +1,6 @@
%{
+/* sconfig, coreboot device tree compiler */
/*
- * sconfig, coreboot device tree compiler
- *
- * Copyright (C) 2010 coresystems GmbH
- * written by Patrick Georgi <patrick@georgi-clan.de>
- *
* 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.
diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped
index 1831e91147..f0233a500c 100644
--- a/util/sconfig/sconfig.tab.c_shipped
+++ b/util/sconfig/sconfig.tab.c_shipped
@@ -67,12 +67,8 @@
/* First part of user prologue. */
+/* sconfig, coreboot device tree compiler */
/*
- * sconfig, coreboot device tree compiler
- *
- * Copyright (C) 2010 coresystems GmbH
- * written by Patrick Georgi <patrick@georgi-clan.de>
- *
* 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.
diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y
index 4af6e1835a..ef3e160c1b 100755
--- a/util/sconfig/sconfig.y
+++ b/util/sconfig/sconfig.y
@@ -1,10 +1,6 @@
%{
+/* sconfig, coreboot device tree compiler */
/*
- * sconfig, coreboot device tree compiler
- *
- * Copyright (C) 2010 coresystems GmbH
- * written by Patrick Georgi <patrick@georgi-clan.de>
- *
* 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.
diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 42b05b5131..1f1931b35b 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -1,9 +1,6 @@
#!/bin/sh
-
# cross-repo-cherrypick - rebase helper script
#
-# Copyright 2015, 2017 Google Inc.
-#
# 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.
diff --git a/util/scripts/dts-to-fmd.sh b/util/scripts/dts-to-fmd.sh
index b468b35bcd..cff44e0ca7 100755
--- a/util/scripts/dts-to-fmd.sh
+++ b/util/scripts/dts-to-fmd.sh
@@ -1,7 +1,4 @@
#!/usr/bin/env bash
-#
-# Copyright 2015 Google Inc.
-#
# 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.
diff --git a/util/scripts/find-unused-kconfig-symbols.sh b/util/scripts/find-unused-kconfig-symbols.sh
index 32240ec0d5..3b84d25f57 100755
--- a/util/scripts/find-unused-kconfig-symbols.sh
+++ b/util/scripts/find-unused-kconfig-symbols.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-# Copyright (c) 2015 Google Inc.
-#
# Permission to use, copy, modify, and/or distribute this software for
# any purpose with or without fee is hereby granted, provided that the
# above copyright notice and this permission notice appear in all copies.
diff --git a/util/scripts/gerrit-rebase b/util/scripts/gerrit-rebase
index 27ee3c7842..83749137c3 100755
--- a/util/scripts/gerrit-rebase
+++ b/util/scripts/gerrit-rebase
@@ -1,7 +1,4 @@
#!/usr/bin/env bash
-
-# Copyright 2016 Google Inc.
-#
# 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.
diff --git a/util/scripts/maintainers.go b/util/scripts/maintainers.go
index 31a720c26a..34841b3955 100644
--- a/util/scripts/maintainers.go
+++ b/util/scripts/maintainers.go
@@ -1,6 +1,4 @@
/*
- * Copyright 2015 Google Inc.
- *
* 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.
diff --git a/util/scripts/no-fsf-addresses.sh b/util/scripts/no-fsf-addresses.sh
index e4200f6226..a76b533cac 100755
--- a/util/scripts/no-fsf-addresses.sh
+++ b/util/scripts/no-fsf-addresses.sh
@@ -1,6 +1,4 @@
#!/bin/sh
-# Copyright (c) 2015 Google Inc.
-#
# Permission to use, copy, modify, and/or distribute this software for
# any purpose with or without fee is hereby granted, provided that the
# above copyright notice and this permission notice appear in all copies.
diff --git a/util/scripts/ucode_h_to_bin.sh b/util/scripts/ucode_h_to_bin.sh
index cb403a4978..e20acfefa4 100755
--- a/util/scripts/ucode_h_to_bin.sh
+++ b/util/scripts/ucode_h_to_bin.sh
@@ -1,11 +1,6 @@
#!/usr/bin/env bash
-#
# This file is part of the coreboot project.
#
-# Copyright (C) 2015 Google Inc.
-#
-# All rights reserved.
-#
# 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 68d8a948ac..cf0bdbd88f 100755
--- a/util/scripts/update_submodules
+++ b/util/scripts/update_submodules
@@ -1,9 +1,6 @@
#!/usr/bin/env bash
-
# This file is part of the coreboot project.
#
-# Copyright (C) 2017 Google Inc.
-#
# 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.
diff --git a/util/showdevicetree/showdt.c b/util/showdevicetree/showdt.c
index 4b476a8d7b..d8a5e62b8f 100644
--- a/util/showdevicetree/showdt.c
+++ b/util/showdevicetree/showdt.c
@@ -1,8 +1,5 @@
+/* Compile and dump the device tree */
/*
- * Compile and dump the device tree
- *
- * Copyright 2013 Google Inc.
- *
* 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.
diff --git a/util/spdtool/spdtool.py b/util/spdtool/spdtool.py
index f6f9f85122..be75e66519 100644
--- a/util/spdtool/spdtool.py
+++ b/util/spdtool/spdtool.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
-
# spdtool - Tool for partial deblobbing of UEFI firmware images
-# Copyright (C) 2019 9elements Agency GmbH <patrick.rudolph@9elements.com>
#
# 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/spkmodem_recv/spkmodem-recv.c b/util/spkmodem_recv/spkmodem-recv.c
index d2e0a81316..5148d2cfad 100644
--- a/util/spkmodem_recv/spkmodem-recv.c
+++ b/util/spkmodem_recv/spkmodem-recv.c
@@ -1,7 +1,5 @@
/* spkmodem-recv.c - decode spkmodem signals */
/*
- * Copyright (C) 2013 Vladimir 'phcoder' Serbinenko
- *
* spkmodem-recv is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index 32f468366d..dab79a907c 100644
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -1,8 +1,5 @@
-##
## This file is part of the superiotool project.
##
-## Copyright (C) 2007-2010 Uwe Hermann <uwe@hermann-uwe.de>
-##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/ali.c b/util/superiotool/ali.c
index 7216bbcfc8..c1344d91b6 100644
--- a/util/superiotool/ali.c
+++ b/util/superiotool/ali.c
@@ -1,8 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/amd.c b/util/superiotool/amd.c
index f78a79ba86..6a379cb951 100644
--- a/util/superiotool/amd.c
+++ b/util/superiotool/amd.c
@@ -1,8 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2011 Rudolf Marek <r.marek@assembler.cz>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/aspeed.c b/util/superiotool/aspeed.c
index 454e5c5baa..977e1817ab 100644
--- a/util/superiotool/aspeed.c
+++ b/util/superiotool/aspeed.c
@@ -1,8 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 9elements Agency GmbH <patrick.rudolph@9elements.com>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/exar.c b/util/superiotool/exar.c
index 8b3c085917..27060f40c4 100644
--- a/util/superiotool/exar.c
+++ b/util/superiotool/exar.c
@@ -1,9 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2016 Derek Waldner
- * Copyright (C) 2016 Sencore Inc <opensource@sencore.com>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index 347462ec7a..48cb89061e 100644
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -1,12 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2006 coresystems GmbH <info@coresystems.de>
- * Copyright (C) 2007-2008 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2014 Edward O'Callaghan <eocallaghan@alterapraxis.com>
- * Copyright (C) 2014 Wilbert Duijvenvoorde <w.a.n.duijvenvoorde@gmail.com>
- * Copyright (C) 2017 Nicola Corna <nicola@corna.info>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/infineon.c b/util/superiotool/infineon.c
index f38714acd2..8e73d33748 100644
--- a/util/superiotool/infineon.c
+++ b/util/superiotool/infineon.c
@@ -1,8 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2011 Jonathan A. Kollasch <jakllsch@kollasch.net>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 81ab024d59..9d9e0e4adb 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -1,11 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2007 Carl-Daniel Hailfinger
- * Copyright (C) 2007-2008 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2018 Libretrend LDA
- * Copyright (C) 2019 Protectli
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c
index f3cbd5f7ff..444267d4f9 100644
--- a/util/superiotool/nsc.c
+++ b/util/superiotool/nsc.c
@@ -1,9 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2006 Ronald Minnich <rminnich@gmail.com>
- * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/nuvoton.c b/util/superiotool/nuvoton.c
index 81bff96eab..c00ef49077 100644
--- a/util/superiotool/nuvoton.c
+++ b/util/superiotool/nuvoton.c
@@ -1,9 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2010 Google Inc.
- * Written by David Hendricks <dhendrix@google.com> for Nuvoton Technology Corp.
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/pci.c b/util/superiotool/pci.c
index f93650f253..1e0c9c1779 100644
--- a/util/superiotool/pci.c
+++ b/util/superiotool/pci.c
@@ -1,8 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/serverengines.c b/util/superiotool/serverengines.c
index 648dbf03a5..c24cecf5fc 100644
--- a/util/superiotool/serverengines.c
+++ b/util/superiotool/serverengines.c
@@ -1,8 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2011 Ruud Schramp <schramp@holmes.nl>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index 7e50548ef9..60d02b8cad 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -1,9 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2008 coresystems GmbH <info@coresystems.de>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index 3e21b0c4b0..c5fa20d190 100644
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -1,11 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2006 Ronald Minnich <rminnich@gmail.com>
- * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2007 Carl-Daniel Hailfinger
- * Copyright (C) 2008 Robinson P. Tryon <bishop.robinson@gmail.com>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index d3b9fd004c..fb6be382a6 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -1,11 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2007 Carl-Daniel Hailfinger
- * Copyright (C) 2007-2010 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2008 Robinson P. Tryon <bishop.robinson@gmail.com>
- * Copyright (C) 2008-2009 coresystems GmbH
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/via.c b/util/superiotool/via.c
index 0312de70c8..374d4db933 100644
--- a/util/superiotool/via.c
+++ b/util/superiotool/via.c
@@ -1,8 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2009 Carl-Daniel Hailfinger
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index dedcfee37c..b2ae178998 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -1,8 +1,5 @@
+/* This file is part of the superiotool project */
/*
- * This file is part of the superiotool project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
diff --git a/util/supermicro/smcbiosinfo/smcbiosinfo.c b/util/supermicro/smcbiosinfo/smcbiosinfo.c
index de81debd75..2213b0e9a1 100644
--- a/util/supermicro/smcbiosinfo/smcbiosinfo.c
+++ b/util/supermicro/smcbiosinfo/smcbiosinfo.c
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2019 9elements Agency GmbH <patrick.rudolph@9elements.com>
- *
* 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.
diff --git a/util/uio_usbdebug/console/printk.c b/util/uio_usbdebug/console/printk.c
index a24a5693eb..a3f6dde223 100644
--- a/util/uio_usbdebug/console/printk.c
+++ b/util/uio_usbdebug/console/printk.c
@@ -1,8 +1,5 @@
+/* This file is part of uio_usbdebug */
/*
- * This file is part of uio_usbdebug
- *
- * Copyright (C) 2013 Nico Huber <nico.h@gmx.de>
- *
* 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.
diff --git a/util/uio_usbdebug/drivers/usb/pci_ehci.c b/util/uio_usbdebug/drivers/usb/pci_ehci.c
index d384fcb561..fc8b3fad46 100644
--- a/util/uio_usbdebug/drivers/usb/pci_ehci.c
+++ b/util/uio_usbdebug/drivers/usb/pci_ehci.c
@@ -1,9 +1,4 @@
/*
- * Copyright (C) 2014 Nico Huber <nico.h@gmx.de>
- *
- * Code borrowed from pci_early.c:
- * Copyright (C) 2011 Google Inc
- *
* 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.
diff --git a/util/uio_usbdebug/include/device/device.h b/util/uio_usbdebug/include/device/device.h
index 453dca2b7b..51c1c7132f 100644
--- a/util/uio_usbdebug/include/device/device.h
+++ b/util/uio_usbdebug/include/device/device.h
@@ -1,6 +1,4 @@
/*
- * Copyright (C) 2014 Nico Huber <nico.h@gmx.de>
- *
* 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.
diff --git a/util/uio_usbdebug/linux/uio_ehci_pci.c b/util/uio_usbdebug/linux/uio_ehci_pci.c
index 56954ed88d..ffc7cfe7e6 100644
--- a/util/uio_usbdebug/linux/uio_ehci_pci.c
+++ b/util/uio_usbdebug/linux/uio_ehci_pci.c
@@ -1,8 +1,5 @@
+/* uio_ehci_pci - UIO driver for PCI EHCI devices */
/*
- * uio_ehci_pci - UIO driver for PCI EHCI devices
- *
- * Copyright (C) 2013 Nico Huber <nico.h@gmx.de>
- *
* This only implements MMIO access (no interrupts).
*
* This program is free software; you can redistribute it and/or modify
diff --git a/util/uio_usbdebug/uio_usbdebug.c b/util/uio_usbdebug/uio_usbdebug.c
index 51faaf8e53..e530700ae7 100644
--- a/util/uio_usbdebug/uio_usbdebug.c
+++ b/util/uio_usbdebug/uio_usbdebug.c
@@ -1,8 +1,5 @@
+/* uio_usbdebug - Run coreboot's usbdebug driver in userspace */
/*
- * uio_usbdebug - Run coreboot's usbdebug driver in userspace
- *
- * Copyright (C) 2013 Nico Huber <nico.h@gmx.de>
- *
* 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.
diff --git a/util/uio_usbdebug/uio_usbdebug_intel.c b/util/uio_usbdebug/uio_usbdebug_intel.c
index 2295cabbc7..bf91660e72 100644
--- a/util/uio_usbdebug/uio_usbdebug_intel.c
+++ b/util/uio_usbdebug/uio_usbdebug_intel.c
@@ -1,8 +1,5 @@
+/* This file is part of uio_usbdebug */
/*
- * This file is part of uio_usbdebug
- *
- * Copyright (C) 2013 Nico Huber <nico.h@gmx.de>
- *
* 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.
diff --git a/util/vgabios/Makefile b/util/vgabios/Makefile
index 45a7259cb7..203b07cdd3 100644
--- a/util/vgabios/Makefile
+++ b/util/vgabios/Makefile
@@ -1,8 +1,5 @@
-##
## This file is part of the coreboot project.
##
-## Copyright (C) 2016 Google Inc.
-##
## 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.
diff --git a/util/vgabios/device.c b/util/vgabios/device.c
index ecd2481a56..b17d965667 100644
--- a/util/vgabios/device.c
+++ b/util/vgabios/device.c
@@ -1,7 +1,4 @@
/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation
- * Copyright (c) 2008, 2009 Pattrick Hueper <phueper@hueper.net>
- * All rights reserved.
* This program and the accompanying materials
* are made available under the terms of the BSD License
* which accompanies this distribution, and is available at
diff --git a/util/vgabios/include/arch/byteorder.h b/util/vgabios/include/arch/byteorder.h
index 33a5e16637..b0b354aafd 100644
--- a/util/vgabios/include/arch/byteorder.h
+++ b/util/vgabios/include/arch/byteorder.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2016 Google Inc
- *
* 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.
diff --git a/util/vgabios/include/config.h b/util/vgabios/include/config.h
index f5d568fff7..35b69a150e 100644
--- a/util/vgabios/include/config.h
+++ b/util/vgabios/include/config.h
@@ -1,8 +1,5 @@
+/* This file is part of the coreboot project */
/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2016 Google Inc
- *
* 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.
diff --git a/util/vgabios/include/console/console.h b/util/vgabios/include/console/console.h
index 90f42e7e05..2858d1dbf6 100644
--- a/util/vgabios/include/console/console.h
+++ b/util/vgabios/include/console/console.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2016 Google Inc
- *
* 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.
diff --git a/util/vgabios/include/stdtypes.h b/util/vgabios/include/stdtypes.h
index 4212f4898c..c31cb35f12 100644
--- a/util/vgabios/include/stdtypes.h
+++ b/util/vgabios/include/stdtypes.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2016 Google Inc
- *
* 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.
diff --git a/util/vgabios/pci-userspace.c b/util/vgabios/pci-userspace.c
index 1b02cf4dc1..2a57f48766 100644
--- a/util/vgabios/pci-userspace.c
+++ b/util/vgabios/pci-userspace.c
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2016 Google Inc
- *
* 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.
diff --git a/util/vgabios/pci-userspace.h b/util/vgabios/pci-userspace.h
index f1da2312e9..4fe933af37 100644
--- a/util/vgabios/pci-userspace.h
+++ b/util/vgabios/pci-userspace.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2016 Google Inc
- *
* 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.
diff --git a/util/vgabios/testbios.c b/util/vgabios/testbios.c
index 189df24411..1c6192c71b 100644
--- a/util/vgabios/testbios.c
+++ b/util/vgabios/testbios.c
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright (C) 2016 Google Inc
- *
* 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.
diff --git a/util/vgabios/testbios.h b/util/vgabios/testbios.h
index c7501ec773..ef46d60645 100644
--- a/util/vgabios/testbios.h
+++ b/util/vgabios/testbios.h
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright 1999 Egbert Eich
- *
* 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.
diff --git a/util/x86/x86_page_tables.go b/util/x86/x86_page_tables.go
index b447ea9fce..34959fae83 100644
--- a/util/x86/x86_page_tables.go
+++ b/util/x86/x86_page_tables.go
@@ -1,7 +1,5 @@
/* This file is part of the coreboot project. */
/*
- * Copyright 2018 Google LLC
- *
* 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.
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 18e08a0659..0ffcf0aa53 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -1,11 +1,6 @@
#!/usr/bin/env bash
-#
# This file is part of the coreboot project.
#
-# Copyright (C) 2007-2010 coresystems GmbH
-# Copyright (C) 2012 Google Inc
-# Copyright (C) 2016 Raptor Engineering, LLC
-#
# 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.