28 files changed, 56 insertions, 75 deletions
diff --git a/futility/cmd_dump_fmap.c b/futility/cmd_dump_fmap.c
index 2ab981bc..2ed0ff6b 100644
--- a/futility/cmd_dump_fmap.c
+++ b/futility/cmd_dump_fmap.c
@@ -1,8 +1,8 @@
-/*
- * Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 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.
  */
+
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/futility/cmd_gbb_utility.c b/futility/cmd_gbb_utility.c
index 84531c4a..2a76ecb1 100644
--- a/futility/cmd_gbb_utility.c
+++ b/futility/cmd_gbb_utility.c
@@ -1,8 +1,8 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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.
  */
+
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>
diff --git a/futility/cmd_load_fmap.c b/futility/cmd_load_fmap.c
index eefa9fec..20da8015 100644
--- a/futility/cmd_load_fmap.c
+++ b/futility/cmd_load_fmap.c
@@ -1,8 +1,8 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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.
  */
+
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/futility/cmd_pcr.c b/futility/cmd_pcr.c
index 051bd8d5..3b9b0ae8 100644
--- a/futility/cmd_pcr.c
+++ b/futility/cmd_pcr.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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/futility/cmd_show.c b/futility/cmd_show.c
index 207cee15..e3fea0fb 100644
--- a/futility/cmd_show.c
+++ b/futility/cmd_show.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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/futility/cmd_sign.c b/futility/cmd_sign.c
index d6ce4e08..9393cdaa 100644
--- a/futility/cmd_sign.c
+++ b/futility/cmd_sign.c
@@ -1,8 +1,8 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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.
  */
+
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/futility/cmd_update.c b/futility/cmd_update.c
index abf1dcab..ebb5d335 100644
--- a/futility/cmd_update.c
+++ b/futility/cmd_update.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 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/futility/cmd_validate_rec_mrc.c b/futility/cmd_validate_rec_mrc.c
index 2f609156..a269681a 100644
--- a/futility/cmd_validate_rec_mrc.c
+++ b/futility/cmd_validate_rec_mrc.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2016 The Chromium OS Authors. All rights reserved.
+/* Copyright 2016 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/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c
index 669dd7a2..17dae146 100644
--- a/futility/cmd_vbutil_kernel.c
+++ b/futility/cmd_vbutil_kernel.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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/futility/file_type.c b/futility/file_type.c
index 2e24b75f..b55d13f1 100644
--- a/futility/file_type.c
+++ b/futility/file_type.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 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/futility/file_type.h b/futility/file_type.h
index a389713b..e1efe760 100644
--- a/futility/file_type.h
+++ b/futility/file_type.h
@@ -1,10 +1,10 @@
-/*
- * Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 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.
  */
-#ifndef VBOOT_REFERENCE_FUTILITY_FILE_TYPE_H_
-#define VBOOT_REFERENCE_FUTILITY_FILE_TYPE_H_
+
+#ifndef VBOOT_REFERENCE_FILE_TYPE_H_
+#define VBOOT_REFERENCE_FILE_TYPE_H_
 
 /* What type of things do I know how to handle? */
 enum futil_file_type {
@@ -76,4 +76,4 @@ int futil_file_type_sign(enum futil_file_type type,
 #undef R_
 #pragma GCC diagnostic pop
 
-#endif	/* VBOOT_REFERENCE_FUTILITY_FILE_TYPE_H_ */
+#endif  /* VBOOT_REFERENCE_FILE_TYPE_H_ */
diff --git a/futility/file_type_bios.c b/futility/file_type_bios.c
index 6ef9211c..6cbd5835 100644
--- a/futility/file_type_bios.c
+++ b/futility/file_type_bios.c
@@ -1,8 +1,8 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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.
  */
+
 #include <errno.h>
 #include <limits.h>
 #include <stdint.h>
diff --git a/futility/file_type_bios.h b/futility/file_type_bios.h
index 3cd2e797..ef401077 100644
--- a/futility/file_type_bios.h
+++ b/futility/file_type_bios.h
@@ -1,10 +1,11 @@
-/*
- * Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 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.
  */
-#ifndef VBOOT_REFERENCE_FUTILITY_FILE_TYPE_BIOS_H_
-#define VBOOT_REFERENCE_FUTILITY_FILE_TYPE_BIOS_H_
+
+#ifndef VBOOT_REFERENCE_FILE_TYPE_BIOS_H_
+#define VBOOT_REFERENCE_FILE_TYPE_BIOS_H_
+
 #include <stdint.h>
 
 /*
@@ -39,4 +40,4 @@ struct bios_state_s {
 	struct bios_area_s rootkey;
 };
 
-#endif	/* VBOOT_REFERENCE_FUTILITY_FILE_TYPE_BIOS_H_ */
+#endif  /* VBOOT_REFERENCE_FILE_TYPE_BIOS_H_ */
diff --git a/futility/file_type_rwsig.c b/futility/file_type_rwsig.c
index 0776f26d..9173a9bd 100644
--- a/futility/file_type_rwsig.c
+++ b/futility/file_type_rwsig.c
@@ -1,10 +1,7 @@
-/*
- * Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 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.
- */
-
-/*
+ *
  * Some instances of the Chrome OS embedded controller firmware can't do a
  * normal software sync handshake at boot, but will verify their own RW images
  * instead. This is typically done by putting a struct vb2_packed_key in the RO
diff --git a/futility/file_type_usbpd1.c b/futility/file_type_usbpd1.c
index d5dbe953..34f8b455 100644
--- a/futility/file_type_usbpd1.c
+++ b/futility/file_type_usbpd1.c
@@ -1,10 +1,7 @@
-/*
- * Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 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.
- */
-
-/*
+ *
  * The USB Type-C chargers released with Samus ("Pixel (2015)") have upgradable
  * firmware. Due to space considerations, we don't have room for handy things
  * like an FMAP or headers for the signatures. Accordingly, all the normally
diff --git a/futility/futility.c b/futility/futility.c
index 4507f820..0f262c2e 100644
--- a/futility/futility.c
+++ b/futility/futility.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright 2013 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/futility/futility.h b/futility/futility.h
index f82986f1..3bce1106 100644
--- a/futility/futility.h
+++ b/futility/futility.h
@@ -1,10 +1,11 @@
-/*
- * Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2013 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.
  */
+
 #ifndef VBOOT_REFERENCE_FUTILITY_H_
 #define VBOOT_REFERENCE_FUTILITY_H_
+
 #include <stdint.h>
 
 #include "2common.h"
@@ -165,4 +166,4 @@ enum arch_t {
 	ARCH_MIPS
 };
 
-#endif /* VBOOT_REFERENCE_FUTILITY_H_ */
+#endif  /* VBOOT_REFERENCE_FUTILITY_H_ */
diff --git a/futility/futility_options.h b/futility/futility_options.h
index dbb8e14b..368cc4f2 100644
--- a/futility/futility_options.h
+++ b/futility/futility_options.h
@@ -1,16 +1,14 @@
-/*
- * Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 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.
- */
-
-/*
+ *
  * We centralize option parsing but may split operations into multiple files,
  * so let's declare the option structures in a single place (here).
  */
 
 #ifndef VBOOT_REFERENCE_FUTILITY_OPTIONS_H_
 #define VBOOT_REFERENCE_FUTILITY_OPTIONS_H_
+
 #include <stdint.h>
 #include "vboot_common.h"
 #include "file_type.h"
@@ -72,4 +70,4 @@ extern struct sign_option_s sign_option;
 /* Return true if hash_alg was identified, either by name or number */
 int vb2_lookup_hash_alg(const char *str, enum vb2_hash_algorithm *alg);
 
-#endif	/* VBOOT_REFERENCE_FUTILITY_OPTIONS_H_ */
+#endif  /* VBOOT_REFERENCE_FUTILITY_OPTIONS_H_ */
diff --git a/futility/kernel_blob.h b/futility/kernel_blob.h
index 1ee4ea7b..332b1d35 100644
--- a/futility/kernel_blob.h
+++ b/futility/kernel_blob.h
@@ -4,6 +4,7 @@
  *
  * Constants describing the kernel blob content.
  */
+
 #ifndef VBOOT_REFERENCE_KERNEL_BLOB_H_
 #define VBOOT_REFERENCE_KERNEL_BLOB_H_
 
@@ -63,4 +64,4 @@ struct linux_kernel_params {
 		e820_entries[E820_ENTRY_MAX];	/* 2d0-cd0 */
 } __attribute__ ((packed));
 
-#endif /* VBOOT_REFERENCE_KERNEL_BLOB_H_ */
+#endif  /* VBOOT_REFERENCE_KERNEL_BLOB_H_ */
diff --git a/futility/misc.c b/futility/misc.c
index 82385c1a..46bf24bb 100644
--- a/futility/misc.c
+++ b/futility/misc.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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/futility/ryu_root_header.c b/futility/ryu_root_header.c
index 48aef431..fff807be 100644
--- a/futility/ryu_root_header.c
+++ b/futility/ryu_root_header.c
@@ -1,8 +1,8 @@
-/*
- * Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 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.
  */
+
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>
diff --git a/futility/updater.c b/futility/updater.c
index c3ffb66f..ef75d747 100644
--- a/futility/updater.c
+++ b/futility/updater.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 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/futility/updater.h b/futility/updater.h
index 74ba2045..51526998 100644
--- a/futility/updater.h
+++ b/futility/updater.h
@@ -1,10 +1,10 @@
-/*
- * Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 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.
  *
  * A reference implementation for AP (and supporting images) firmware updater.
  */
+
 #ifndef VBOOT_REFERENCE_FUTILITY_UPDATER_H_
 #define VBOOT_REFERENCE_FUTILITY_UPDATER_H_
 
diff --git a/futility/updater_archive.c b/futility/updater_archive.c
index 1dd6d1d1..da2e99ee 100644
--- a/futility/updater_archive.c
+++ b/futility/updater_archive.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 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/futility/updater_quirks.c b/futility/updater_quirks.c
index eb277b71..d5f5ec62 100644
--- a/futility/updater_quirks.c
+++ b/futility/updater_quirks.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2018 The Chromium OS Authors. All rights reserved.
+/* Copyright 2018 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/futility/vb1_helper.c b/futility/vb1_helper.c
index ab72f05a..d99c45fa 100644
--- a/futility/vb1_helper.c
+++ b/futility/vb1_helper.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright 2014 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/futility/vb1_helper.h b/futility/vb1_helper.h
index f0904a90..0699998e 100644
--- a/futility/vb1_helper.h
+++ b/futility/vb1_helper.h
@@ -1,10 +1,9 @@
-/*
- * Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2014 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.
  */
-#ifndef VBOOT_REFERENCE_FUTILITY_VB1_HELPER_H_
-#define VBOOT_REFERENCE_FUTILITY_VB1_HELPER_H_
+#ifndef VBOOT_REFERENCE_VB1_HELPER_H_
+#define VBOOT_REFERENCE_VB1_HELPER_H_
 
 struct vb2_kernel_preamble;
 struct vb2_keyblock;
@@ -67,4 +66,4 @@ int VerifyKernelBlob(uint8_t *kernel_blob,
 
 uint64_t kernel_cmd_line_offset(const struct vb2_kernel_preamble *preamble);
 
-#endif	/* VBOOT_REFERENCE_FUTILITY_VB1_HELPER_H_ */
+#endif  /* VBOOT_REFERENCE_VB1_HELPER_H_ */
diff --git a/futility/vb2_helper.c b/futility/vb2_helper.c
index ba04db33..cdaff888 100644
--- a/futility/vb2_helper.c
+++ b/futility/vb2_helper.c
@@ -1,5 +1,4 @@
-/*
- * Copyright 2015 The Chromium OS Authors. All rights reserved.
+/* Copyright 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.
  */