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>

48 files changed, 35 insertions, 201 deletions

diff --git a/util/cbfstool/ProcessorBind.h b/util/cbfstool/ProcessorBind.h
index c0f4df0ee5df..7cad59c54421 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 641e1ea6c0cf..a42cfc25040b 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 830fe16fc122..c06319088c3f 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 be920b4598f9..3f6b0268c5f1 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 6b4bf27b8593..2b5a4b9e70d3 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 f0c215d0d767..11e80c43d78d 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 9bf368830490..a0b2a82d8e65 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 1bb3c686e544..fa460f1ba1a9 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 088534adc973..c5f016f08a0b 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 3526f8d94c3c..c968a68d8bb7 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 028893c35f5e..b50d4efafcf1 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 f15c65b6e700..1421c8ec3e52 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 3ee1b6a0f388..da0ea173795d 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 c1725dc90384..2de67dcf7bfa 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 f1521043e9aa..94c1a980289b 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 993809426fb9..b92da0eac3e9 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 daf0458e932f..9c393f13d525 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 53fe7a1fcaae..216e2778eebb 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 8b08c135afc0..1cc6eb2c33eb 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 8ba50f79193c..f35872022faa 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 c647ec506e67..feec0cf28a97 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 6255fc563377..ca84dcc97888 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 7f147ce3e98a..a9b4e4374786 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 c02068c1c2cb..55be8196f5b1 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 1185a08d5259..0029a5d58b9d 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 4843962f1bc1..32a4d385e204 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 9b57d58cfd5e..b2e3fbeb11f5 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 aabe5ff19e3c..d6483dbaf419 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 374667a373a0..1773050125b0 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 6159cfa3181b..8464aa549706 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 1c01ec0da92e..3b10f79e5b39 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 7a289d774312..5d990cad7f6f 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 90e6d6e1768f..8a9e1518cbd6 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 3ba710c28949..b10835e89512 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 be9a5def84c5..525fe6f743ee 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 996508d1861d..8a6031d9c8b2 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 dce37c8084cc..3a9c37e09724 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 b25db4f099c8..591f588c59a7 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 4bba6f0d5ebf..c8281f752cb2 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 3b4e730b3347..fd21475bbe5c 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 7b4fad51c0c9..dcdcf081a4e5 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 9a25f5ac53d5..134238374ca0 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 a2d9ddfee230..917341c1f9b1 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 5a8f4dd5afd1..75d51e062f1f 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 bbcc2aebb08d..90af3af54588 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 1d087b165828..800a85b9d862 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 abd8c027acd1..7b29194295c1 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 06cc91f40978..d7bcb32c174c 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.