diff options
| author | Chris Engel <cjengel@us.ibm.com> | 2016-04-13 13:32:43 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2016-07-27 12:22:07 -0400 |
| commit | 3d565d0fd7f4f05803e53ab7274008fa448030f6 (patch) | |
| tree | fd6ef511ac6281f1c041dc11956b934ffe43db12 /src/usr/secureboot/trusted/base | |
| parent | c7ba6555103fb93d5c23b5b9faaff789098b93eb (diff) | |
| download | talos-hostboot-3d565d0fd7f4f05803e53ab7274008fa448030f6.tar.gz talos-hostboot-3d565d0fd7f4f05803e53ab7274008fa448030f6.zip | |
Support for TPM Required attribute to allow system to IPL without a TPM
Change-Id: I53e841036dfff75c6ed7d04ee55292b1285a6bee
RTC: 125287
ForwardPort: yes
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27454
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christopher J. Engel <cjengel@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/secureboot/trusted/base')
| -rw-r--r-- | src/usr/secureboot/trusted/base/trustedboot_base.C | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/usr/secureboot/trusted/base/trustedboot_base.C b/src/usr/secureboot/trusted/base/trustedboot_base.C index 3f9fc9576..e782e115f 100644 --- a/src/usr/secureboot/trusted/base/trustedboot_base.C +++ b/src/usr/secureboot/trusted/base/trustedboot_base.C @@ -69,6 +69,7 @@ TpmTarget::TpmTarget() mutex_init(&tpmMutex); } + #endif @@ -82,8 +83,6 @@ errlHndl_t pcrExtend(TPM_Pcr i_pcr, #ifdef CONFIG_TPMDD MessageMode mode = MSG_MODE_ASYNC; - assert(!systemTpms.tpmDaemonShutdown, "TPM Daemon shutdown"); - TRACDCOMP( g_trac_trustedboot, ENTER_MRK"pcrExtend()" ); TRACUCOMP( g_trac_trustedboot, ENTER_MRK"pcrExtend() pcr=%d msg='%s'", i_pcr, i_logMsg); |
