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/include/usr/secureboot | |
| 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/include/usr/secureboot')
| -rw-r--r-- | src/include/usr/secureboot/trustedboot_reasoncodes.H | 16 | ||||
| -rw-r--r-- | src/include/usr/secureboot/trustedbootif.H | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/include/usr/secureboot/trustedboot_reasoncodes.H b/src/include/usr/secureboot/trustedboot_reasoncodes.H index 4ee9a16e1..c636681fb 100644 --- a/src/include/usr/secureboot/trustedboot_reasoncodes.H +++ b/src/include/usr/secureboot/trustedboot_reasoncodes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2015,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,13 +22,25 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ + +///////////////////////////////////////////////////////////////// +// NOTE: This file is exportable as TSS-Lite for skiboot/PHYP // +///////////////////////////////////////////////////////////////// + #ifndef __TRUSTEDBOOT_REASONCODES_H #define __TRUSTEDBOOT_REASONCODES_H +#ifdef __HOSTBOOT_MODULE #include <hbotcompid.H> +#else +#define SECURE_COMP_ID 0x1E00 +#endif +#ifdef __cplusplus namespace TRUSTEDBOOT { +#endif + enum TRUSTEDModuleId { MOD_HOST_UPDATE_MASTER_TPM = 0x00, @@ -54,6 +66,8 @@ namespace TRUSTEDBOOT RC_TPM_UNMARSHAL_INVALID_CMD = SECURE_COMP_ID | 0xA8, RC_TPM_UNMARSHALING_FAIL = SECURE_COMP_ID | 0xA9, }; +#ifdef __cplusplus } +#endif #endif diff --git a/src/include/usr/secureboot/trustedbootif.H b/src/include/usr/secureboot/trustedbootif.H index dea32b959..f9e4c1e48 100644 --- a/src/include/usr/secureboot/trustedbootif.H +++ b/src/include/usr/secureboot/trustedbootif.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2015,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -33,6 +33,7 @@ // ----------------------------------------------- // Includes // ----------------------------------------------- +#include <targeting/common/targetservice.H> #include <i2c/tpmddif.H> #include <errl/errlentry.H> |
