diff options
author | Joel Kitching <kitching@google.com> | 2019-08-29 13:58:52 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-09-23 17:54:12 +0000 |
commit | ffd42a82201423d7b82cffd755baf3d5cd5c7efc (patch) | |
tree | 744299c8a134b963e8ac117c1d62a4a5d1b51f73 /firmware/lib | |
parent | 56b70c403ea47f7da67c69b72c84d591b8f3ce21 (diff) | |
download | vboot-ffd42a82201423d7b82cffd755baf3d5cd5c7efc.tar.gz |
vboot: fix up some more includes
Should have no extra line breaks in between local includes,
and should be sorted alphabetically.
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: I83c25d30d7376712857314965a7d93f57190aa3f
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776281
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware/lib')
-rw-r--r-- | firmware/lib/cgptlib/cgptlib.c | 3 | ||||
-rw-r--r-- | firmware/lib/cgptlib/cgptlib_internal.c | 1 | ||||
-rw-r--r-- | firmware/lib/cgptlib/crc32.c | 2 | ||||
-rw-r--r-- | firmware/lib/ec_sync.c | 3 | ||||
-rw-r--r-- | firmware/lib/ec_sync_all.c | 3 | ||||
-rw-r--r-- | firmware/lib/gpt_misc.c | 4 | ||||
-rw-r--r-- | firmware/lib/mocked_secdata_tpm.c | 2 | ||||
-rw-r--r-- | firmware/lib/secdata_tpm.c | 4 | ||||
-rw-r--r-- | firmware/lib/tpm2_lite/marshaling.c | 3 | ||||
-rw-r--r-- | firmware/lib/tpm2_lite/tlcl.c | 2 | ||||
-rw-r--r-- | firmware/lib/tpm_lite/mocked_tlcl.c | 1 | ||||
-rw-r--r-- | firmware/lib/tpm_lite/tlcl.c | 3 | ||||
-rw-r--r-- | firmware/lib/utility_string.c | 2 | ||||
-rw-r--r-- | firmware/lib/vboot_api_kernel.c | 1 | ||||
-rw-r--r-- | firmware/lib/vboot_audio.c | 3 | ||||
-rw-r--r-- | firmware/lib/vboot_common.c | 4 | ||||
-rw-r--r-- | firmware/lib/vboot_common_init.c | 5 | ||||
-rw-r--r-- | firmware/lib/vboot_display.c | 2 | ||||
-rw-r--r-- | firmware/lib/vboot_ui.c | 2 | ||||
-rw-r--r-- | firmware/lib/vboot_ui_common.c | 2 |
20 files changed, 20 insertions, 32 deletions
diff --git a/firmware/lib/cgptlib/cgptlib.c b/firmware/lib/cgptlib/cgptlib.c index 25a2fe27..7803a7e9 100644 --- a/firmware/lib/cgptlib/cgptlib.c +++ b/firmware/lib/cgptlib/cgptlib.c @@ -3,9 +3,8 @@ * found in the LICENSE file. */ -#include "2sysincludes.h" #include "2common.h" - +#include "2sysincludes.h" #include "cgptlib.h" #include "cgptlib_internal.h" #include "crc32.h" diff --git a/firmware/lib/cgptlib/cgptlib_internal.c b/firmware/lib/cgptlib/cgptlib_internal.c index a29d2535..50ad936a 100644 --- a/firmware/lib/cgptlib/cgptlib_internal.c +++ b/firmware/lib/cgptlib/cgptlib_internal.c @@ -4,7 +4,6 @@ */ #include "2sysincludes.h" - #include "cgptlib.h" #include "cgptlib_internal.h" #include "crc32.h" diff --git a/firmware/lib/cgptlib/crc32.c b/firmware/lib/cgptlib/crc32.c index 72f73fc4..f97fe5a5 100644 --- a/firmware/lib/cgptlib/crc32.c +++ b/firmware/lib/cgptlib/crc32.c @@ -39,8 +39,8 @@ /* polynomial $edb88320 */ /* */ /* -------------------------------------------------------------------- */ -#include "2sysincludes.h" +#include "2sysincludes.h" #include "crc32.h" static uint32_t crc32_tab[] = { diff --git a/firmware/lib/ec_sync.c b/firmware/lib/ec_sync.c index 719a8be1..a2fac707 100644 --- a/firmware/lib/ec_sync.c +++ b/firmware/lib/ec_sync.c @@ -5,11 +5,10 @@ * EC software sync routines for vboot */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" - +#include "2sysincludes.h" #include "ec_sync.h" #include "vboot_api.h" #include "vboot_common.h" diff --git a/firmware/lib/ec_sync_all.c b/firmware/lib/ec_sync_all.c index 467c3300..5b205474 100644 --- a/firmware/lib/ec_sync_all.c +++ b/firmware/lib/ec_sync_all.c @@ -5,11 +5,10 @@ * EC software sync routines for vboot */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" - +#include "2sysincludes.h" #include "ec_sync.h" #include "vboot_api.h" #include "vboot_common.h" diff --git a/firmware/lib/gpt_misc.c b/firmware/lib/gpt_misc.c index 38646437..dfe9084b 100644 --- a/firmware/lib/gpt_misc.c +++ b/firmware/lib/gpt_misc.c @@ -3,9 +3,8 @@ * found in the LICENSE file. */ -#include "2sysincludes.h" #include "2common.h" - +#include "2sysincludes.h" #include "cgptlib.h" #include "cgptlib_internal.h" #include "crc32.h" @@ -13,7 +12,6 @@ #include "utility.h" #include "vboot_api.h" - /** * Allocate and read GPT data from the drive. * diff --git a/firmware/lib/mocked_secdata_tpm.c b/firmware/lib/mocked_secdata_tpm.c index b2f0670f..9aa09272 100644 --- a/firmware/lib/mocked_secdata_tpm.c +++ b/firmware/lib/mocked_secdata_tpm.c @@ -6,9 +6,9 @@ * stored in the TPM NVRAM. */ -#include "utility.h" #include "secdata_tpm.h" #include "tss_constants.h" +#include "utility.h" vb2_error_t SetVirtualDevMode(int val) { diff --git a/firmware/lib/secdata_tpm.c b/firmware/lib/secdata_tpm.c index 5ddb16cd..cf179978 100644 --- a/firmware/lib/secdata_tpm.c +++ b/firmware/lib/secdata_tpm.c @@ -6,9 +6,11 @@ * stored in the TPM NVRAM. */ -#include "2sysincludes.h" #include "2common.h" #include "2crc8.h" +#include "2nvstorage.h" +#include "2secdata.h" +#include "2sysincludes.h" #include "secdata_tpm.h" #include "tlcl.h" #include "tss_constants.h" diff --git a/firmware/lib/tpm2_lite/marshaling.c b/firmware/lib/tpm2_lite/marshaling.c index fb1b8022..90ce04ca 100644 --- a/firmware/lib/tpm2_lite/marshaling.c +++ b/firmware/lib/tpm2_lite/marshaling.c @@ -3,9 +3,8 @@ * found in the LICENSE file. */ -#include "2sysincludes.h" #include "2common.h" - +#include "2sysincludes.h" #include "tpm2_marshaling.h" #include "utility.h" diff --git a/firmware/lib/tpm2_lite/tlcl.c b/firmware/lib/tpm2_lite/tlcl.c index 70cc3e0e..1ac18c2d 100644 --- a/firmware/lib/tpm2_lite/tlcl.c +++ b/firmware/lib/tpm2_lite/tlcl.c @@ -7,8 +7,8 @@ */ #include "2common.h" -#include "secdata_tpm.h" #include "2sysincludes.h" +#include "secdata_tpm.h" #include "tlcl.h" #include "tpm2_marshaling.h" #include "utility.h" diff --git a/firmware/lib/tpm_lite/mocked_tlcl.c b/firmware/lib/tpm_lite/mocked_tlcl.c index ec5a152a..d0f61201 100644 --- a/firmware/lib/tpm_lite/mocked_tlcl.c +++ b/firmware/lib/tpm_lite/mocked_tlcl.c @@ -4,7 +4,6 @@ */ #include "2sysincludes.h" - #include "tlcl.h" #include "tlcl_internal.h" #include "utility.h" diff --git a/firmware/lib/tpm_lite/tlcl.c b/firmware/lib/tpm_lite/tlcl.c index b5cb44fc..1fba3204 100644 --- a/firmware/lib/tpm_lite/tlcl.c +++ b/firmware/lib/tpm_lite/tlcl.c @@ -14,11 +14,10 @@ * time. */ -#include "2sysincludes.h" #include "2common.h" #include "2hmac.h" #include "2sha.h" - +#include "2sysincludes.h" #include "tlcl.h" #include "tlcl_internal.h" #include "tlcl_structures.h" diff --git a/firmware/lib/utility_string.c b/firmware/lib/utility_string.c index 87b2293b..299bbaa1 100644 --- a/firmware/lib/utility_string.c +++ b/firmware/lib/utility_string.c @@ -6,10 +6,8 @@ */ #include "2sysincludes.h" - #include "utility.h" - uint32_t Uint64ToString(char *buf, uint32_t bufsize, uint64_t value, uint32_t radix, uint32_t zero_pad_width) { diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index eb05109b..a52412fd 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -5,7 +5,6 @@ * High-level firmware wrapper API - entry points for kernel selection */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c index d59b65bf..c5212013 100644 --- a/firmware/lib/vboot_audio.c +++ b/firmware/lib/vboot_audio.c @@ -5,10 +5,9 @@ * Delay/beep functions used in dev-mode kernel selection. */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" - +#include "2sysincludes.h" #include "utility.h" #include "vboot_api.h" #include "vboot_audio.h" diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c index b1c6d339..75492080 100644 --- a/firmware/lib/vboot_common.c +++ b/firmware/lib/vboot_common.c @@ -6,14 +6,14 @@ * (Firmware portion) */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" +#include "utility.h" #include "vboot_api.h" #include "vboot_common.h" -#include "utility.h" const char *kVbootErrors[VBOOT_ERROR_MAX] = { "Success.", diff --git a/firmware/lib/vboot_common_init.c b/firmware/lib/vboot_common_init.c index 174f39c7..00a201b6 100644 --- a/firmware/lib/vboot_common_init.c +++ b/firmware/lib/vboot_common_init.c @@ -6,12 +6,11 @@ * (Firmware portion) */ -#include "2sysincludes.h" #include "2common.h" - +#include "2sysincludes.h" +#include "utility.h" #include "vboot_api.h" #include "vboot_common.h" -#include "utility.h" vb2_error_t VbSharedDataInit(VbSharedDataHeader *header, uint64_t size) { diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index 9341e1e3..eb471484 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -5,11 +5,11 @@ * Display functions used in kernel selection. */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2sha.h" +#include "2sysincludes.h" #include "utility.h" #include "vboot_api.h" #include "vboot_common.h" diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c index 35dafe97..aa9a58cb 100644 --- a/firmware/lib/vboot_ui.c +++ b/firmware/lib/vboot_ui.c @@ -5,12 +5,12 @@ * High-level firmware wrapper API - user interface for RW firmware */ -#include "2sysincludes.h" #include "2common.h" #include "2misc.h" #include "2nvstorage.h" #include "2rsa.h" #include "2secdata.h" +#include "2sysincludes.h" #include "ec_sync.h" #include "load_kernel_fw.h" #include "secdata_tpm.h" diff --git a/firmware/lib/vboot_ui_common.c b/firmware/lib/vboot_ui_common.c index 376e1a67..1e956576 100644 --- a/firmware/lib/vboot_ui_common.c +++ b/firmware/lib/vboot_ui_common.c @@ -6,8 +6,8 @@ */ #include "2common.h" -#include "secdata_tpm.h" #include "2sysincludes.h" +#include "secdata_tpm.h" #include "vboot_api.h" #include "vboot_kernel.h" #include "vboot_ui_common.h" |