diff options
| author | Jaymes Wilks <mjwilks@us.ibm.com> | 2017-02-02 09:42:19 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-03-03 13:51:48 -0500 |
| commit | 2384503c61febe6b4b543afcae1cdc0ae27c1132 (patch) | |
| tree | 08e58bdd248b1c479f8390ed18a337e6dbea0f4f /src/usr/secureboot/trusted/makefile | |
| parent | a9eefaa1086c7a3cc51e374c52a7c04397968fd5 (diff) | |
| download | talos-hostboot-2384503c61febe6b4b543afcae1cdc0ae27c1132.tar.gz talos-hostboot-2384503c61febe6b4b543afcae1cdc0ae27c1132.zip | |
Integrate p9_update_security_ctrl HWP into Istep 10.3
Add handling of TPM deconfig and SBE Secure Seeprom Lock by
integrating the hardware procedure p9_update_security_ctrl into
Istep 10.3 and retriggering the hardware procedure any time a
TPM fails.
Change-Id: I36f57dc7aef3de6661357736a525fe25a3828c6e
RTC:153891
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36189
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/secureboot/trusted/makefile')
| -rw-r--r-- | src/usr/secureboot/trusted/makefile | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/usr/secureboot/trusted/makefile b/src/usr/secureboot/trusted/makefile index b3da5a509..7ccb04ac2 100644 --- a/src/usr/secureboot/trusted/makefile +++ b/src/usr/secureboot/trusted/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -24,15 +24,31 @@ # IBM_PROLOG_END_TAG ROOTPATH = ../../../.. MODULE = secureboot_trusted +PERV_HWP_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/perv +#Hardware procedure includes +EXTRAINCDIR += ${PERV_HWP_PATH} +EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ +EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ + +#Trustedboot compilation units OBJS += $(if $(CONFIG_TPMDD),trustedboot.o,) OBJS += $(if $(CONFIG_TPMDD),trustedbootCmds.o,) OBJS += $(if $(CONFIG_TPMDD),trustedTypes.o,) OBJS += $(if $(CONFIG_TPMDD),tpmLogMgr.o,) OBJS += $(if $(CONFIG_TPMDD),trustedbootUtils.o,) +#Handle the hardware procedure link dependency +VPATH += ${PERV_HWP_PATH} + SUBDIRS += $(if $(CONFIG_TPMDD),test.d,) CFLAGS += -iquote ../ +#Include HWP procedure makefiles +include ${ROOTPATH}/procedure.rules.mk +include ${PERV_HWP_PATH}/p9_update_security_ctrl.mk + include ${ROOTPATH}/config.mk |
