diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2015-11-22 11:34:38 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2015-11-22 19:23:11 -0500 |
| commit | 12575330e5f6182909a9c6a692796b391857b03a (patch) | |
| tree | 7ebd82be2675fb15a3c7b59bc0d3530863cee0a6 /src/tcgbios.c | |
| parent | 8bd4a08daecf286b5e99c6fb5ff286b1ce2f7cca (diff) | |
| download | seabios-hppa-12575330e5f6182909a9c6a692796b391857b03a.zip seabios-hppa-12575330e5f6182909a9c6a692796b391857b03a.tar.gz seabios-hppa-12575330e5f6182909a9c6a692796b391857b03a.tar.bz2 | |
tpm: Move tpm_start_option_rom_scan() and tpm_calling_int19h() into callers
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/tcgbios.c')
| -rw-r--r-- | src/tcgbios.c | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/tcgbios.c b/src/tcgbios.c index d415714..c6782ee 100644 --- a/src/tcgbios.c +++ b/src/tcgbios.c @@ -601,18 +601,6 @@ tpm_add_action(u32 pcrIndex, const char *string) string, len, (u8 *)string, len); } -static u32 -tpm_calling_int19h(void) -{ - if (!CONFIG_TCGBIOS) - return 0; - - if (!has_working_tpm()) - return TCG_GENERAL_ERROR; - - return tpm_add_action(4, "Calling INT 19h"); -} - /* * Add event separators for PCRs 0 to 7; specs on 'Measuring Boot Events' */ @@ -642,21 +630,6 @@ tpm_add_event_separators(void) return rc; } -/* - * Add measurement to the log about option rom scan - */ -static u32 -tpm_start_option_rom_scan(void) -{ - if (!CONFIG_TCGBIOS) - return 0; - - if (!has_working_tpm()) - return TCG_GENERAL_ERROR; - - return tpm_add_action(2, "Start Option ROM Scan"); -} - static u32 tpm_smbios_measure(void) { @@ -743,7 +716,7 @@ tpm_startup(void) if (rc) goto err_exit; - rc = tpm_start_option_rom_scan(); + rc = tpm_add_action(2, "Start Option ROM Scan"); if (rc) goto err_exit; @@ -817,7 +790,7 @@ tpm_prepboot(void) if (rc || returnCode) goto err_exit; - rc = tpm_calling_int19h(); + rc = tpm_add_action(4, "Calling INT 19h"); if (rc) goto err_exit; |