treewide: move copyrights and authors to AUTHORS

Also split "this is part of" line from copyright notices.

Change-Id: Ibc2446410bcb3104ead458b40a9ce7819c61a8eb
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41067
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>

99 files changed, 94 insertions, 281 deletions

diff --git a/AUTHORS b/AUTHORS
index 2534a4625c..4bc62a7b63 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -43,6 +43,7 @@ Code Aurora Forum
 coresystems GmbH
 Corey Osgood
 Curt Brune
+Custom Ideas
 Damien Zammit
 Dave Airlie
 David Brownell
@@ -56,6 +57,7 @@ DENX Software Engineering
 Derek Waldner
 Digital Design Corporation
 DMP Electronics Inc.
+Donghwa Lee
 Drew Eckhardt
 Dynon Avionics
 Edward O'Callaghan
@@ -76,6 +78,7 @@ Free Software Foundation, Inc.
 Freescale Semiconductor, Inc.
 Gary Jennejohn
 George Trudeau
+Gerald Van Baren
 Gerd Hoffmann
 Gergely Kiss
 Google LLC
@@ -91,6 +94,7 @@ Idwer Vollering
 Igor Pavlov
 Imagination Technologies
 Infineon Technologies
+InKi Dae
 Intel Corporation
 Iru Cai
 Isaku Yamahata
@@ -135,6 +139,7 @@ Marvell Semiconductor Inc.
 Matt DeVillier
 Maxim Polyakov
 MediaTek Inc.
+Michael Brunner
 Michael Schroeder
 Michael Niewöhner
 Mika Westerberg
@@ -163,6 +168,7 @@ Paulo Alcantara
 Pavel Sayekat
 PC Engines GmbH
 Per Odlund
+Peter Korsgaard
 Peter Stuge
 Philipp Degler
 Philipp Deppenwiese
diff --git a/src/commonlib/include/commonlib/sd_mmc_ctrlr.h b/src/commonlib/include/commonlib/sd_mmc_ctrlr.h
index 0807d2e2c5..d681d2ecb2 100644
--- a/src/commonlib/include/commonlib/sd_mmc_ctrlr.h
+++ b/src/commonlib/include/commonlib/sd_mmc_ctrlr.h
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * Controller independent definitions
  */
 #ifndef __COMMONLIB_SD_MMC_CTRLR_H__
diff --git a/src/commonlib/include/commonlib/sdhci.h b/src/commonlib/include/commonlib/sdhci.h
index 126ef0176b..2ce3e8a39f 100644
--- a/src/commonlib/include/commonlib/sdhci.h
+++ b/src/commonlib/include/commonlib/sdhci.h
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * SD host controller specific definitions
  */
 #ifndef __COMMONLIB_SDHCI_H__
diff --git a/src/commonlib/storage/bouncebuf.c b/src/commonlib/storage/bouncebuf.c
index 6bc5cf4103..722a6c8d0b 100644
--- a/src/commonlib/storage/bouncebuf.c
+++ b/src/commonlib/storage/bouncebuf.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * Generic bounce buffer implementation
  */
 
diff --git a/src/commonlib/storage/bouncebuf.h b/src/commonlib/storage/bouncebuf.h
index 6a2e759614..615f73e2f6 100644
--- a/src/commonlib/storage/bouncebuf.h
+++ b/src/commonlib/storage/bouncebuf.h
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * Generic bounce buffer implementation
  */
 
diff --git a/src/commonlib/storage/mmc.c b/src/commonlib/storage/mmc.c
index 6346c432ba..d822865053 100644
--- a/src/commonlib/storage/mmc.c
+++ b/src/commonlib/storage/mmc.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * MultiMediaCard (MMC) and eMMC specific support code
  * This code is controller independent
  */
diff --git a/src/commonlib/storage/sd.c b/src/commonlib/storage/sd.c
index 1b4bee0b47..a925088afa 100644
--- a/src/commonlib/storage/sd.c
+++ b/src/commonlib/storage/sd.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * Secure Digital (SD) card specific support code
  * This code is controller independent
  */
diff --git a/src/commonlib/storage/sd_mmc.c b/src/commonlib/storage/sd_mmc.c
index c8df33595a..8c0c1f7e1d 100644
--- a/src/commonlib/storage/sd_mmc.c
+++ b/src/commonlib/storage/sd_mmc.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * MultiMediaCard (MMC), eMMC and Secure Digital (SD) common initialization
  * code which brings the card into the standby state.  This code is controller
  * independent.
diff --git a/src/commonlib/storage/sdhci.c b/src/commonlib/storage/sdhci.c
index 47286c54d2..231224c556 100644
--- a/src/commonlib/storage/sdhci.c
+++ b/src/commonlib/storage/sdhci.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * Secure Digital (SD) Host Controller interface specific code
  */
 
diff --git a/src/commonlib/storage/sdhci_adma.c b/src/commonlib/storage/sdhci_adma.c
index 843497116c..285ac0f1ec 100644
--- a/src/commonlib/storage/sdhci_adma.c
+++ b/src/commonlib/storage/sdhci_adma.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * Secure Digital (SD) Host Controller interface DMA support code
  */
 
diff --git a/src/commonlib/storage/sdhci_display.c b/src/commonlib/storage/sdhci_display.c
index 4169f7ec98..6dad33c36e 100644
--- a/src/commonlib/storage/sdhci_display.c
+++ b/src/commonlib/storage/sdhci_display.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * Secure Digital (SD) Host Controller interface specific code
  */
 
diff --git a/src/commonlib/storage/storage.c b/src/commonlib/storage/storage.c
index 8f5a72f248..050d8bfb60 100644
--- a/src/commonlib/storage/storage.c
+++ b/src/commonlib/storage/storage.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * MultiMediaCard (MMC), eMMC and Secure Digital (SD) common code which
  * transitions the card from the standby state to the transfer state.  The
  * common code supports read operations, erase and write operations are in
diff --git a/src/commonlib/storage/storage_erase.c b/src/commonlib/storage/storage_erase.c
index b01388077e..2425b765d6 100644
--- a/src/commonlib/storage/storage_erase.c
+++ b/src/commonlib/storage/storage_erase.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * MultiMediaCard (MMC), eMMC and Secure Digital (SD) erase support code.
  * This code is controller independent.
  */
diff --git a/src/commonlib/storage/storage_write.c b/src/commonlib/storage/storage_write.c
index edf13fc0a3..f5af6dc663 100644
--- a/src/commonlib/storage/storage_write.c
+++ b/src/commonlib/storage/storage_write.c
@@ -9,7 +9,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ */
+/*
  * MultiMediaCard (MMC), eMMC and Secure Digital (SD) write support code.
  * This code is controller independent.
  */
diff --git a/src/ec/google/chromeec/ec_message.h b/src/ec/google/chromeec/ec_message.h
index be0b08ab03..f0eab2f185 100644
--- a/src/ec/google/chromeec/ec_message.h
+++ b/src/ec/google/chromeec/ec_message.h
@@ -1,8 +1,7 @@
 /*
  * Chromium OS Matrix Keyboard Message Protocol definitions
- *
- * Copyright (c) 2012 The Chromium OS Authors.
- *
+ */
+/*
  * 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/src/ec/kontron/kempld/kempld_i2c.c b/src/ec/kontron/kempld/kempld_i2c.c
index ab41097782..56283eacc4 100644
--- a/src/ec/kontron/kempld/kempld_i2c.c
+++ b/src/ec/kontron/kempld/kempld_i2c.c
@@ -1,15 +1,9 @@
 /*
  * I2C bus driver for Kontron COM modules
  *
- * Copyright (C) 2017 secunet Security Networks AG
- *
- * Based on the similar driver in Linux:
- *
- * Copyright (c) 2010-2013 Kontron Europe GmbH
- * Author: Michael Brunner <michael.brunner@kontron.com>
- *
- * The driver is based on the i2c-ocores driver by Peter Korsgaard.
- *
+ * Based on the similar driver in Linux.
+ */
+/*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License 2 as published
  * by the Free Software Foundation.
diff --git a/src/include/b64_decode.h b/src/include/b64_decode.h
index 4d0970e1a5..0deb7aae31 100644
--- a/src/include/b64_decode.h
+++ b/src/include/b64_decode.h
@@ -1,6 +1,4 @@
 /*
- * Copyright (C) 2015 Google, Inc.
- *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
  * may be copied, distributed, and modified under those terms.
diff --git a/src/include/device_tree.h b/src/include/device_tree.h
index 30da803b63..0de9dba21a 100644
--- a/src/include/device_tree.h
+++ b/src/include/device_tree.h
@@ -1,9 +1,5 @@
+/* Taken from depthcharge: src/base/device_tree.h */
 /*
- * Copyright 2013 Google Inc.
- * Copyright 2018-present Facebook, Inc.
- *
- * Taken from depthcharge: src/base/device_tree.h
- *
  * 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/src/include/endian.h b/src/include/endian.h
index 0f32b7484a..a1c7f6a89b 100644
--- a/src/include/endian.h
+++ b/src/include/endian.h
@@ -1,6 +1,4 @@
 /*
- * 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; either version 2 of
diff --git a/src/include/fit.h b/src/include/fit.h
index 1c90aca1ff..beec38ae6a 100644
--- a/src/include/fit.h
+++ b/src/include/fit.h
@@ -1,9 +1,5 @@
+/* Taken from depthcharge: src/boot/fit.h */
 /*
- * Copyright 2013 Google Inc.
- * Copyright 2018-present Facebook, Inc.
- *
- * Taken from depthcharge: src/boot/fit.h
- *
  * 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/src/include/fit_payload.h b/src/include/fit_payload.h
index dd66289853..657c7d57f3 100644
--- a/src/include/fit_payload.h
+++ b/src/include/fit_payload.h
@@ -1,9 +1,4 @@
 /*
- * Copyright 2013 Google Inc.
- *
- * See file CREDITS for list of people who contributed to this
- * 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
diff --git a/src/include/list.h b/src/include/list.h
index 201a8d39a8..9706080713 100644
--- a/src/include/list.h
+++ b/src/include/list.h
@@ -1,9 +1,5 @@
+/* Taken from depthcharge: src/base/list.h */
 /*
- * Copyright 2012 Google Inc.
- * Copyright 2018-present Facebook, Inc.
- *
- * Taken from depthcharge: src/base/list.h
- *
  * 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/src/include/memory_info.h b/src/include/memory_info.h
index ad3c1775f9..03b4fdc738 100644
--- a/src/include/memory_info.h
+++ b/src/include/memory_info.h
@@ -1,8 +1,5 @@
+/* Memory information */
 /*
- * Memory information
- *
- * Copyright (C) 2014, Intel Corporation. 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 version
  * 2 as published by the Free Software Foundation.
diff --git a/src/include/spi-generic.h b/src/include/spi-generic.h
index 30228867fc..a57ec907d5 100644
--- a/src/include/spi-generic.h
+++ b/src/include/spi-generic.h
@@ -1,7 +1,4 @@
 /*
- * (C) Copyright 2001
- * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.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/src/include/spi_flash.h b/src/include/spi_flash.h
index c74ceaeed4..5dce7206ab 100644
--- a/src/include/spi_flash.h
+++ b/src/include/spi_flash.h
@@ -1,8 +1,5 @@
+/* Interface to SPI flash */
 /*
- * Interface to SPI flash
- *
- * Copyright (C) 2008 Atmel Corporation
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * version 2 as published by the Free Software Foundation.
diff --git a/src/lib/b64_decode.c b/src/lib/b64_decode.c
index 9efa465c25..57c883870e 100644
--- a/src/lib/b64_decode.c
+++ b/src/lib/b64_decode.c
@@ -1,6 +1,4 @@
 /*
- * Copyright (C) 2015 Google, Inc.
- *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
  * may be copied, distributed, and modified under those terms.
diff --git a/src/lib/device_tree.c b/src/lib/device_tree.c
index b8faab53b8..2124edd582 100644
--- a/src/lib/device_tree.c
+++ b/src/lib/device_tree.c
@@ -1,9 +1,5 @@
+/* Taken from depthcharge: src/base/device_tree.c */
 /*
- * Copyright 2013 Google Inc.
- * Copyright 2018-present Facebook, Inc.
- *
- * Taken from depthcharge: src/base/device_tree.c
- *
  * 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/src/lib/fit.c b/src/lib/fit.c
index edac1927e7..be6c87a936 100644
--- a/src/lib/fit.c
+++ b/src/lib/fit.c
@@ -1,9 +1,5 @@
+/* Taken from depthcharge: src/boot/fit.c */
 /*
- * Copyright 2013 Google Inc.
- * Copyright 2018-present Facebook, Inc.
- *
- * Taken from depthcharge: src/boot/fit.c
- *
  * 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/src/lib/hexdump.c b/src/lib/hexdump.c
index 8ecba6d512..95f3b93f91 100644
--- a/src/lib/hexdump.c
+++ b/src/lib/hexdump.c
@@ -1,6 +1,4 @@
 /*
- * 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; either version 2 of
diff --git a/src/lib/list.c b/src/lib/list.c
index 06d422d30e..9138ab30cd 100644
--- a/src/lib/list.c
+++ b/src/lib/list.c
@@ -1,9 +1,5 @@
+/* Taken from depthcharge: src/base/list.c */
 /*
- * Copyright 2012 Google Inc.
- * Copyright 2018-present Facebook, Inc.
- *
- * Taken from depthcharge: src/base/list.c
- *
  * 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/src/mainboard/emulation/qemu-i440fx/dsdt.asl b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
index ad9243b9cb..c4ca0b3013 100644
--- a/src/mainboard/emulation/qemu-i440fx/dsdt.asl
+++ b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
@@ -1,8 +1,5 @@
+/* Bochs/QEMU ACPI DSDT ASL definition */
 /*
- * Bochs/QEMU ACPI DSDT ASL definition
- *
- * Copyright (c) 2006 Fabrice Bellard
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License version 2 as published by the Free Software Foundation.
diff --git a/src/mainboard/emulation/qemu-q35/dsdt.asl b/src/mainboard/emulation/qemu-q35/dsdt.asl
index 5e4769da56..31a26603c2 100644
--- a/src/mainboard/emulation/qemu-q35/dsdt.asl
+++ b/src/mainboard/emulation/qemu-q35/dsdt.asl
@@ -1,10 +1,5 @@
+/* Bochs/QEMU ACPI DSDT ASL definition */
 /*
- * Bochs/QEMU ACPI DSDT ASL definition
- *
- * Copyright (c) 2006 Fabrice Bellard
- * Copyright (c) 2010 Isaku Yamahata
- *                    yamahata at valinux co jp
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License version 2 as published by the Free Software Foundation.
diff --git a/src/mainboard/intel/galileo/vboot.c b/src/mainboard/intel/galileo/vboot.c
index 3ec5bb3b44..b0f8ae207b 100644
--- a/src/mainboard/intel/galileo/vboot.c
+++ b/src/mainboard/intel/galileo/vboot.c
@@ -1,6 +1,4 @@
 /*
- * Copyright (C) 2016-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; either version 2 of
diff --git a/src/mainboard/intel/galileo/vboot.fmd b/src/mainboard/intel/galileo/vboot.fmd
index 4d349bdf19..3a64387636 100644
--- a/src/mainboard/intel/galileo/vboot.fmd
+++ b/src/mainboard/intel/galileo/vboot.fmd
@@ -1,6 +1,4 @@
 #
-# Copyright (C) 2016-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; either version 2 of
diff --git a/src/mainboard/ti/beaglebone/leds.c b/src/mainboard/ti/beaglebone/leds.c
index dd1471d06b..abad71867a 100644
--- a/src/mainboard/ti/beaglebone/leds.c
+++ b/src/mainboard/ti/beaglebone/leds.c
@@ -1,6 +1,4 @@
 /*
- * 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; either version 2 of
diff --git a/src/mainboard/ti/beaglebone/leds.h b/src/mainboard/ti/beaglebone/leds.h
index a4a6001f40..6a2d3ecb76 100644
--- a/src/mainboard/ti/beaglebone/leds.h
+++ b/src/mainboard/ti/beaglebone/leds.h
@@ -1,6 +1,4 @@
 /*
- * 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; either version 2 of
diff --git a/src/soc/nvidia/tegra210/include/soc/mipi_display.h b/src/soc/nvidia/tegra210/include/soc/mipi_display.h
index 96a6e42bab..38e4f9d186 100644
--- a/src/soc/nvidia/tegra210/include/soc/mipi_display.h
+++ b/src/soc/nvidia/tegra210/include/soc/mipi_display.h
@@ -5,10 +5,6 @@
  * Display Working Group standards: DSI, DCS, DBI, DPI
  *
  * Author: Imre Deak <imre.deak@nokia.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #ifndef MIPI_DISPLAY_H
 #define MIPI_DISPLAY_H
diff --git a/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h b/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
index 55fe5d9c40..1c86c8da28 100644
--- a/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
+++ b/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
@@ -4,10 +4,6 @@
  * MIPI DSI Bus
  *
  * Andrzej Hajda <a.hajda@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #ifndef __MIPI_DSI_H__
diff --git a/src/soc/qualcomm/qcs405/clock.c b/src/soc/qualcomm/qcs405/clock.c
index e2e03c3e32..cbc16a9614 100644
--- a/src/soc/qualcomm/qcs405/clock.c
+++ b/src/soc/qualcomm/qcs405/clock.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 version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/qcs405/include/soc/clock.h b/src/soc/qualcomm/qcs405/include/soc/clock.h
index c021c49fa1..1778214d47 100644
--- a/src/soc/qualcomm/qcs405/include/soc/clock.h
+++ b/src/soc/qualcomm/qcs405/include/soc/clock.h
@@ -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 version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/sc7180/include/soc/qcom_qup_se.h b/src/soc/qualcomm/sc7180/include/soc/qcom_qup_se.h
index 307ea6ab54..221e44af33 100644
--- a/src/soc/qualcomm/sc7180/include/soc/qcom_qup_se.h
+++ b/src/soc/qualcomm/sc7180/include/soc/qcom_qup_se.h
@@ -1,7 +1,5 @@
 /* This file is part of the coreboot project. */
 /*
- * Copyright (c) 2018-2019 Qualcomm Technologies
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/sc7180/include/soc/qupv3_config.h b/src/soc/qualcomm/sc7180/include/soc/qupv3_config.h
index b2a89a53c0..941f6565c3 100644
--- a/src/soc/qualcomm/sc7180/include/soc/qupv3_config.h
+++ b/src/soc/qualcomm/sc7180/include/soc/qupv3_config.h
@@ -1,8 +1,5 @@
+/* This file is part of the coreboot project. */
 /*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2019, The Linux Foundation.  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 version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/sc7180/include/soc/qupv3_i2c.h b/src/soc/qualcomm/sc7180/include/soc/qupv3_i2c.h
index e69f461ff9..3eaf0ce190 100644
--- a/src/soc/qualcomm/sc7180/include/soc/qupv3_i2c.h
+++ b/src/soc/qualcomm/sc7180/include/soc/qupv3_i2c.h
@@ -1,8 +1,5 @@
+/* This file is part of the depthcharge project. */
 /*
- * This file is part of the depthcharge project.
- *
- * Copyright (C) 2018-2019, The Linux Foundation.  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 version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/sc7180/include/soc/qupv3_spi.h b/src/soc/qualcomm/sc7180/include/soc/qupv3_spi.h
index a147070fe0..172d937bd1 100644
--- a/src/soc/qualcomm/sc7180/include/soc/qupv3_spi.h
+++ b/src/soc/qualcomm/sc7180/include/soc/qupv3_spi.h
@@ -1,7 +1,5 @@
 /* This file is part of the coreboot project. */
 /*
- * Copyright (c) 2018-2019 Qualcomm Technologies
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/sc7180/qcom_qup_se.c b/src/soc/qualcomm/sc7180/qcom_qup_se.c
index e0a7d4ca7b..58a1b36606 100644
--- a/src/soc/qualcomm/sc7180/qcom_qup_se.c
+++ b/src/soc/qualcomm/sc7180/qcom_qup_se.c
@@ -1,7 +1,5 @@
 /* This file is part of the coreboot project. */
 /*
- * Copyright (c) 2018-2019 Qualcomm Technologies
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/sc7180/qupv3_config.c b/src/soc/qualcomm/sc7180/qupv3_config.c
index 14df187886..15b6b4dbe9 100644
--- a/src/soc/qualcomm/sc7180/qupv3_config.c
+++ b/src/soc/qualcomm/sc7180/qupv3_config.c
@@ -1,8 +1,5 @@
+/* This file is part of the coreboot project. */
 /*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2020, The Linux Foundation.  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 version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/sc7180/qupv3_i2c.c b/src/soc/qualcomm/sc7180/qupv3_i2c.c
index b8938e2315..02f92b4aa0 100644
--- a/src/soc/qualcomm/sc7180/qupv3_i2c.c
+++ b/src/soc/qualcomm/sc7180/qupv3_i2c.c
@@ -1,8 +1,5 @@
+/* This file is part of the depthcharge project. */
 /*
- * This file is part of the depthcharge project.
- *
- * Copyright (C) 2018-2020, The Linux Foundation.  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 version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/sc7180/qupv3_spi.c b/src/soc/qualcomm/sc7180/qupv3_spi.c
index 756d6efb82..4d26a2933b 100644
--- a/src/soc/qualcomm/sc7180/qupv3_spi.c
+++ b/src/soc/qualcomm/sc7180/qupv3_spi.c
@@ -1,7 +1,5 @@
 /* This file is part of the coreboot project. */
 /*
- * Copyright (C) 2018-2020, The Linux Foundation.  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 version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/qualcomm/sc7180/qupv3_uart.c b/src/soc/qualcomm/sc7180/qupv3_uart.c
index ac3032f491..916d4aa4d4 100644
--- a/src/soc/qualcomm/sc7180/qupv3_uart.c
+++ b/src/soc/qualcomm/sc7180/qupv3_uart.c
@@ -1,7 +1,5 @@
 /* This file is part of the coreboot project. */
 /*
- * Copyright (c) 2018-2020, The Linux Foundation. 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 version 2 and
  * only version 2 as published by the Free Software Foundation.
diff --git a/src/soc/samsung/exynos5420/dmc_init_ddr3.c b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
index 8ba1eab9e5..90ad93298a 100644
--- a/src/soc/samsung/exynos5420/dmc_init_ddr3.c
+++ b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
@@ -1,7 +1,6 @@
 /* This file is part of the coreboot project. */
+/* DDR3 mem setup file for EXYNOS5 based board */
 /*
- * DDR3 mem setup file for EXYNOS5 based board
- *
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/src/soc/samsung/exynos5420/dp.c b/src/soc/samsung/exynos5420/dp.c
index f1d374e1a3..101630dab4 100644
--- a/src/soc/samsung/exynos5420/dp.c
+++ b/src/soc/samsung/exynos5420/dp.c
@@ -1,7 +1,5 @@
 /*
  *
- * Author: Donghwa Lee <dh09.lee@samsung.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/src/soc/samsung/exynos5420/dp_lowlevel.c b/src/soc/samsung/exynos5420/dp_lowlevel.c
index 33140e2c33..6bb73512ab 100644
--- a/src/soc/samsung/exynos5420/dp_lowlevel.c
+++ b/src/soc/samsung/exynos5420/dp_lowlevel.c
@@ -1,7 +1,5 @@
 /*
  *
- * Author: Donghwa Lee <dh09.lee@samsung.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/src/soc/samsung/exynos5420/fimd.c b/src/soc/samsung/exynos5420/fimd.c
index 66745037fe..20480f4251 100644
--- a/src/soc/samsung/exynos5420/fimd.c
+++ b/src/soc/samsung/exynos5420/fimd.c
@@ -1,8 +1,5 @@
 /*
  *
- * Author: InKi Dae <inki.dae@samsung.com>
- * Author: Donghwa Lee <dh09.lee@samsung.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/src/southbridge/intel/common/spi.h b/src/southbridge/intel/common/spi.h
index 3b8410cd9f..3c997f8e60 100644
--- a/src/southbridge/intel/common/spi.h
+++ b/src/southbridge/intel/common/spi.h
@@ -1,7 +1,6 @@
-/*
- * 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
+/* 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/fdt.h b/util/cbfstool/fdt.h
index 387cd328ed..126ca95200 100644
--- a/util/cbfstool/fdt.h
+++ b/util/cbfstool/fdt.h
@@ -1,9 +1,5 @@
+/* Taken from depthcharge: src/base/device_tree.h */
 /*
- * Copyright 2013 Google Inc.
- * Copyright 2018-present Facebook, Inc.
- *
- * Taken from depthcharge: src/base/device_tree.h
- *
  * 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/ectool/ec.c b/util/ectool/ec.c
index d6c20001d8..17a08dcbf9 100644
--- a/util/ectool/ec.c
+++ b/util/ectool/ec.c
@@ -1,8 +1,5 @@
+/* This file is part of the ectool project. */
 /*
- * This file is part of the ectool project.
- *
- * 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; version 2 of the License.
diff --git a/util/ectool/ec.h b/util/ectool/ec.h
index fd062356d0..b7bc6b938f 100644
--- a/util/ectool/ec.h
+++ b/util/ectool/ec.h
@@ -1,7 +1,5 @@
+/* This file is part of the ectool project. */
 /*
- * This file is part of the ectool project.
- *
- * 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
diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c
index 2af45c30f2..21e1023b34 100644
--- a/util/ectool/ectool.c
+++ b/util/ectool/ectool.c
@@ -1,7 +1,5 @@
+/* This file is part of the ectool project. */
 /*
- * This file is part of the ectool project.
- *
- * 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
diff --git a/util/intelmetool/me.c b/util/intelmetool/me.c
index 0cb162707c..e3df257272 100644
--- a/util/intelmetool/me.c
+++ b/util/intelmetool/me.c
@@ -1,6 +1,5 @@
 /* This file is part of the coreboot project. */
 /*
- * Copyright (C) 2011 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
diff --git a/util/intelmetool/me.h b/util/intelmetool/me.h
index dca9a20f7c..4e0036e2d3 100644
--- a/util/intelmetool/me.h
+++ b/util/intelmetool/me.h
@@ -1,6 +1,5 @@
 /* This file is part of the coreboot project. */
 /*
- * Copyright (C) 2011 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
diff --git a/util/intelmetool/me_status.c b/util/intelmetool/me_status.c
index 3f654f3916..77c3ba6644 100644
--- a/util/intelmetool/me_status.c
+++ b/util/intelmetool/me_status.c
@@ -1,6 +1,5 @@
 /* This file is part of the coreboot project. */
 /*
- * Copyright (C) 2011 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
diff --git a/util/intelmetool/mmap.c b/util/intelmetool/mmap.c
index e3075a8121..70bc42244d 100644
--- a/util/intelmetool/mmap.c
+++ b/util/intelmetool/mmap.c
@@ -1,7 +1,5 @@
-/* intelmetool
- *
- * Copyright (C) 2013-2015 Damien Zammit <damien@zamaudio.com>
- *
+/* intelmetool */
+/*
  * 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/mmap.h b/util/intelmetool/mmap.h
index 31d8313bf3..ecc327a535 100644
--- a/util/intelmetool/mmap.h
+++ b/util/intelmetool/mmap.h
@@ -1,6 +1,5 @@
-/* intelmetool
- *
- * Copyright (C) 2013-2015 Damien Zammit <damien@zamaudio.com>
+/* intelmetool */
+/*
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/util/intelmetool/msr.c b/util/intelmetool/msr.c
index 5c84f2b582..d8735a7c0b 100644
--- a/util/intelmetool/msr.c
+++ b/util/intelmetool/msr.c
@@ -1,8 +1,5 @@
-/* intelmetool
- *
- * Copyright (C) 2013-2016 Philipp Deppenwiese <zaolin@das-labor.org>,
- * Copyright (C) 2013-2016 Alexander Couzens <lynxis@fe80.eu>
- *
+/* intelmetool */
+/*
  * 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/msr.h b/util/intelmetool/msr.h
index 1f6a1175af..c40700f248 100644
--- a/util/intelmetool/msr.h
+++ b/util/intelmetool/msr.h
@@ -1,7 +1,5 @@
-/* intelmetool
- *
- * Copyright (C) 2013-2016 Philipp Deppenwiese <zaolin@das-labor.org>
- * Copyright (C) 2013-2016 Alexander Couzens <lynxis@fe80.eu>
+/* intelmetool */
+/*
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/util/intelmetool/rcba.c b/util/intelmetool/rcba.c
index ebc2d9ca48..d1aaa671a8 100644
--- a/util/intelmetool/rcba.c
+++ b/util/intelmetool/rcba.c
@@ -1,6 +1,4 @@
 /*
- * Copyright (C) 2014  Damien Zammit <damien@zamaudio.com>
- * Copyright (C) 2017  Patrick Rudolph <siro@das-labor.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/util/intelmetool/rcba.h b/util/intelmetool/rcba.h
index d40dcb9262..a87fe49180 100644
--- a/util/intelmetool/rcba.h
+++ b/util/intelmetool/rcba.h
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2017  Patrick Rudolph <siro@das-labor.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/util/inteltool/ahci.c b/util/inteltool/ahci.c
index 82f792d0e6..4be40ff38a 100644
--- a/util/inteltool/ahci.c
+++ b/util/inteltool/ahci.c
@@ -1,8 +1,5 @@
+/* ahci.c: dump AHCI registers */
 /*
- * ahci.c: dump AHCI registers
- *
- * Copyright (C) 2016 Iru Cai
- * 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
diff --git a/util/msrtool/Makefile.in b/util/msrtool/Makefile.in
index f50adc240d..45b4ba280a 100644
--- a/util/msrtool/Makefile.in
+++ b/util/msrtool/Makefile.in
@@ -2,8 +2,6 @@
 #
 # This file is part of msrtool.
 #
-# Copyright (c) 2008 Peter Stuge <peter@stuge.se>
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
diff --git a/util/msrtool/configure b/util/msrtool/configure
index 0606f4b8b9..5f55056c9d 100755
--- a/util/msrtool/configure
+++ b/util/msrtool/configure
@@ -2,8 +2,6 @@
 #
 # This file is part of msrtool.
 #
-# Copyright (c) 2008, 2009 Peter Stuge <peter@stuge.se>
-#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
diff --git a/util/msrtool/cs5536.c b/util/msrtool/cs5536.c
index d9c66d2c88..3d035000a3 100644
--- a/util/msrtool/cs5536.c
+++ b/util/msrtool/cs5536.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2009 Peter Stuge <peter@stuge.se>
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
diff --git a/util/msrtool/darwin.c b/util/msrtool/darwin.c
index 1423fbd74d..efa37fce79 100644
--- a/util/msrtool/darwin.c
+++ b/util/msrtool/darwin.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 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 version 2 as
diff --git a/util/msrtool/freebsd.c b/util/msrtool/freebsd.c
index 84988c748b..40cd9a16d7 100644
--- a/util/msrtool/freebsd.c
+++ b/util/msrtool/freebsd.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2009 Andriy Gapon <avg@icyb.net.ua>
- * Copyright (c) 2009 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/geodegx2.c b/util/msrtool/geodegx2.c
index 9b6f221591..d6a845fc12 100644
--- a/util/msrtool/geodegx2.c
+++ b/util/msrtool/geodegx2.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
- * Copyright (c) 2009 Nils Jacobs <njacobs8@hetnet.nl>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/geodelx.c b/util/msrtool/geodelx.c
index b7e8917118..bac8ec1a82 100644
--- a/util/msrtool/geodelx.c
+++ b/util/msrtool/geodelx.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_atom.c b/util/msrtool/intel_atom.c
index 8a73d94966..ac63a2615f 100644
--- a/util/msrtool/intel_atom.c
+++ b/util/msrtool/intel_atom.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2013 Olivier Langlois <olivier@olivierlanglois.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_core1.c b/util/msrtool/intel_core1.c
index fdf4005cc8..fcb3a91659 100644
--- a/util/msrtool/intel_core1.c
+++ b/util/msrtool/intel_core1.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_core2_early.c b/util/msrtool/intel_core2_early.c
index a3c7ad26cc..ea35ac4b04 100644
--- a/util/msrtool/intel_core2_early.c
+++ b/util/msrtool/intel_core2_early.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_core2_later.c b/util/msrtool/intel_core2_later.c
index fda85327bd..7e1cdfd9c6 100644
--- a/util/msrtool/intel_core2_later.c
+++ b/util/msrtool/intel_core2_later.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2013 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_nehalem.c b/util/msrtool/intel_nehalem.c
index c5c30826f1..3f472e8f6f 100644
--- a/util/msrtool/intel_nehalem.c
+++ b/util/msrtool/intel_nehalem.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2012 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium3.c b/util/msrtool/intel_pentium3.c
index e541e00e95..aedc4402cf 100644
--- a/util/msrtool/intel_pentium3.c
+++ b/util/msrtool/intel_pentium3.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium3_early.c b/util/msrtool/intel_pentium3_early.c
index dbbc985b4d..676f134c41 100644
--- a/util/msrtool/intel_pentium3_early.c
+++ b/util/msrtool/intel_pentium3_early.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium4_early.c b/util/msrtool/intel_pentium4_early.c
index 088a68ddcc..249cac8136 100644
--- a/util/msrtool/intel_pentium4_early.c
+++ b/util/msrtool/intel_pentium4_early.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium4_later.c b/util/msrtool/intel_pentium4_later.c
index a23a99e606..0b51707d19 100644
--- a/util/msrtool/intel_pentium4_later.c
+++ b/util/msrtool/intel_pentium4_later.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/intel_pentium_d.c b/util/msrtool/intel_pentium_d.c
index f3675614f8..28b544bb01 100644
--- a/util/msrtool/intel_pentium_d.c
+++ b/util/msrtool/intel_pentium_d.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/k8.c b/util/msrtool/k8.c
index 16f626f55a..96aa6c5dfe 100644
--- a/util/msrtool/k8.c
+++ b/util/msrtool/k8.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2009 Marc Jones <marcj303@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/linux.c b/util/msrtool/linux.c
index 64b4af212f..ccf8dbd0e0 100644
--- a/util/msrtool/linux.c
+++ b/util/msrtool/linux.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index 540ff53961..13586d8c78 100644
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index 8cba4c7483..f6ba66829b 100644
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.h
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
- * Copyright (c) 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 version 2 as
diff --git a/util/msrtool/msrutils.c b/util/msrtool/msrutils.c
index 1c6707e4c2..82199a8f80 100644
--- a/util/msrtool/msrutils.c
+++ b/util/msrtool/msrutils.c
@@ -1,7 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/msrtool/sys.c b/util/msrtool/sys.c
index 7ff1131b63..f79391d434 100644
--- a/util/msrtool/sys.c
+++ b/util/msrtool/sys.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (c) 2008 Peter Stuge <peter@stuge.se>
- * Copyright (c) 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 version 2 as
diff --git a/util/msrtool/via_c7.c b/util/msrtool/via_c7.c
index 07ed1756e7..9939798151 100644
--- a/util/msrtool/via_c7.c
+++ b/util/msrtool/via_c7.c
@@ -1,8 +1,5 @@
+/* This file is part of msrtool. */
 /*
- * This file is part of msrtool.
- *
- * Copyright (C) 2011 Anton Kochkov <anton.kochkov@gmail.com>
- * Copyright (C) 2017 Lubomir Rintel <lkundrak@v3.sk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/pgtblgen/pgtblgen.c b/util/pgtblgen/pgtblgen.c
index 234fd72a0e..b8bd0ed787 100644
--- a/util/pgtblgen/pgtblgen.c
+++ b/util/pgtblgen/pgtblgen.c
@@ -1,7 +1,5 @@
+/* This file is part of pgtblgen. */
 /*
- * This file is part of pgtblgen.
- *
- * Copyright (c) 2019 Patrick Rudolph <siro@das-labor.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
diff --git a/util/qualcomm/scripts/cmm/debug_cb_405.cmm b/util/qualcomm/scripts/cmm/debug_cb_405.cmm
index 166d2aa308..bc677e9e62 100644
--- a/util/qualcomm/scripts/cmm/debug_cb_405.cmm
+++ b/util/qualcomm/scripts/cmm/debug_cb_405.cmm
@@ -2,8 +2,6 @@
 ;##
 ;## This file is part of the coreboot project.
 ;##
-;## Copyright (C) 2018, The Linux Foundation.  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 version 2 and
 ;## only version 2 as published by the Free Software Foundation.
diff --git a/util/qualcomm/scripts/cmm/debug_cb_845.cmm b/util/qualcomm/scripts/cmm/debug_cb_845.cmm
index c0a9cca74e..f99ff26216 100644
--- a/util/qualcomm/scripts/cmm/debug_cb_845.cmm
+++ b/util/qualcomm/scripts/cmm/debug_cb_845.cmm
@@ -2,8 +2,6 @@
 ;##
 ;## This file is part of the coreboot project.
 ;##
-;## Copyright (C) 2018, The Linux Foundation.  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 version 2 and
 ;## only version 2 as published by the Free Software Foundation.
diff --git a/util/qualcomm/scripts/cmm/debug_cb_common.cmm b/util/qualcomm/scripts/cmm/debug_cb_common.cmm
index bf90575823..f81d92b7ff 100644
--- a/util/qualcomm/scripts/cmm/debug_cb_common.cmm
+++ b/util/qualcomm/scripts/cmm/debug_cb_common.cmm
@@ -2,8 +2,6 @@
 ;##
 ;## This file is part of the coreboot project.
 ;##
-;## Copyright (C) 2018, The Linux Foundation.  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 version 2 and
 ;## only version 2 as published by the Free Software Foundation.
diff --git a/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm b/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm
index 5d72ff792e..fd12041e4c 100644
--- a/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm
+++ b/util/qualcomm/scripts/cmm/debug_cb_trogdor.cmm
@@ -2,8 +2,6 @@
 ;##
 ;## This file is part of the coreboot project.
 ;##
-;## Copyright (C) 2019, The Linux Foundation.  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 version 2 and
 ;## only version 2 as published by the Free Software Foundation.
diff --git a/util/qualcomm/scripts/cmm/debug_chroot_common.cmm b/util/qualcomm/scripts/cmm/debug_chroot_common.cmm
index 0e1d58baf5..93c2418a81 100644
--- a/util/qualcomm/scripts/cmm/debug_chroot_common.cmm
+++ b/util/qualcomm/scripts/cmm/debug_chroot_common.cmm
@@ -2,8 +2,6 @@
 ;##
 ;## This file is part of the coreboot project.
 ;##
-;## Copyright (C) 2018, The Linux Foundation.  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 version 2 and
 ;## only version 2 as published by the Free Software Foundation.
diff --git a/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm b/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm
index d93a4c0374..e84e54d35d 100644
--- a/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm
+++ b/util/qualcomm/scripts/cmm/debug_chroot_trogdor.cmm
@@ -2,8 +2,6 @@
 ;##
 ;## This file is part of the coreboot project.
 ;##
-;## Copyright (C) 2019, The Linux Foundation.  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 version 2 and
 ;## only version 2 as published by the Free Software Foundation.