diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-03-16 14:55:36 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-03-30 10:59:38 -0400 |
| commit | 7e53643075803b2654bebec85f693c90d1b503f6 (patch) | |
| tree | 67d6fbfb13b8b74dcb72cca54320e0d4efab39bf /src/usr/secureboot | |
| parent | da8ebbbccc858f874bb9841a1a23390798d4f14d (diff) | |
| download | talos-hostboot-7e53643075803b2654bebec85f693c90d1b503f6.tar.gz talos-hostboot-7e53643075803b2654bebec85f693c90d1b503f6.zip | |
Secureboot best effort compatibility support
Change-Id: I1671459ca58684b14f65f322ff6dccddcaad40a2
RTC: 170685
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38104
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/secureboot')
| -rw-r--r-- | src/usr/secureboot/HBconfig | 10 | ||||
| -rw-r--r-- | src/usr/secureboot/base/makefile | 2 | ||||
| -rw-r--r-- | src/usr/secureboot/trusted/base/trustedboot_base.C | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/usr/secureboot/HBconfig b/src/usr/secureboot/HBconfig index 0ef8bc748..e52e25101 100644 --- a/src/usr/secureboot/HBconfig +++ b/src/usr/secureboot/HBconfig @@ -2,7 +2,15 @@ config SECUREBOOT default y help - Enable secure boot + Enable and enforce secure boot + +# @TODO RTC:155374 Remove this in the future +config SECUREBOOT_BEST_EFFORT + default y if SECUREBOOT + depends on SECUREBOOT + help + Enable Best effort Secureboot. Should only be used for + phasing in new secureboot functionality. config DRTM #TODO RTC: 170487 Disable for relevant platforms default y if (SECUREBOOT && TPMDD) diff --git a/src/usr/secureboot/base/makefile b/src/usr/secureboot/base/makefile index 58d79be86..c58c54487 100644 --- a/src/usr/secureboot/base/makefile +++ b/src/usr/secureboot/base/makefile @@ -47,5 +47,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/secureboot/trusted/base VPATH += ${ROOTPATH}/src/usr/secureboot/trusted/base VPATH += ${ROOTPATH}/src/securerom +EXTRAINCDIR += ${ROOTPATH}/src/usr/pnor/ + CFLAGS += -iquote ../ include ${ROOTPATH}/config.mk diff --git a/src/usr/secureboot/trusted/base/trustedboot_base.C b/src/usr/secureboot/trusted/base/trustedboot_base.C index c4a149368..8dfe6cb0a 100644 --- a/src/usr/secureboot/trusted/base/trustedboot_base.C +++ b/src/usr/secureboot/trusted/base/trustedboot_base.C @@ -50,6 +50,7 @@ #include "../trustedbootCmds.H" #include "../trustedbootUtils.H" #include "trustedbootMsg.H" +#include <pnor_utils.H> // ---------------------------------------------- // Trace definitions |
