diff options
author | Chris Engel <cjengel@us.ibm.com> | 2016-02-25 20:41:52 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-03-08 14:03:10 -0500 |
commit | 76ec87b247baa7a9f2564ab576a05385b8814c83 (patch) | |
tree | ec0cf31fdb87e779a72ae127e4fe78fd66e021bf /src/usr/secureboot/trusted/trustedboot.C | |
parent | ced9d370d02715fb8e492623b4d49b873ea48d0e (diff) | |
download | talos-hostboot-76ec87b247baa7a9f2564ab576a05385b8814c83.tar.gz talos-hostboot-76ec87b247baa7a9f2564ab576a05385b8814c83.zip |
Trustedboot : Refactor to allow for skiboot import of TSSLite
Change-Id: I1e90a71f1027e0a801b96cbad6d59e432357f281
RTC: 125289
ForwardPort: yes
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21318
Tested-by: Jenkins Server
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW
Tested-by: FSP CI Jenkins
Reviewed-by: Timothy R. Block <block@us.ibm.com>
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21809
Diffstat (limited to 'src/usr/secureboot/trusted/trustedboot.C')
-rw-r--r-- | src/usr/secureboot/trusted/trustedboot.C | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/usr/secureboot/trusted/trustedboot.C b/src/usr/secureboot/trusted/trustedboot.C index cf777d0f5..ac2882174 100644 --- a/src/usr/secureboot/trusted/trustedboot.C +++ b/src/usr/secureboot/trusted/trustedboot.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2015,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,9 +40,10 @@ #include <errl/errludstring.H> #include <targeting/common/targetservice.H> #include <secureboot/trustedbootif.H> +#include <secureboot/trustedboot_reasoncodes.H> #include "trustedboot.H" #include "trustedTypes.H" -#include <secureboot/trustedboot_reasoncodes.H> +#include "trustedbootCmds.H" // ---------------------------------------------- // Trace definitions @@ -192,14 +193,14 @@ void tpmInitialize(TRUSTEDBOOT::TpmTarget & io_target, io_target.failed = false; // TPM_STARTUP - err = tpmCmdStartup(io_target); + err = tpmCmdStartup(&io_target); if (NULL != err) { break; } // TPM_GETCAPABILITY to read FW Version - err = tpmCmdGetCapFwVersion(io_target); + err = tpmCmdGetCapFwVersion(&io_target); if (NULL != err) { break; |