diff options
4 files changed, 11 insertions, 0 deletions
diff --git a/meta-facebook/conf/machine/include/facebook-tpm2.inc b/meta-facebook/conf/machine/include/facebook-tpm2.inc new file mode 100644 index 000000000..207f08cbc --- /dev/null +++ b/meta-facebook/conf/machine/include/facebook-tpm2.inc @@ -0,0 +1,2 @@ +MACHINE_FEATURES:append = " tpm2" +DISTRO_FEATURES:append = " tpm" diff --git a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample index e02b182c7..3b24ed861 100644 --- a/meta-facebook/meta-bletchley/conf/bblayers.conf.sample +++ b/meta-facebook/meta-bletchley/conf/bblayers.conf.sample @@ -14,6 +14,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-openembedded/meta-webserver \ ##OEROOT##/meta-security \ + ##OEROOT##/meta-security/meta-tpm \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-facebook \ @@ -28,6 +29,7 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-openembedded/meta-webserver \ ##OEROOT##/meta-security \ + ##OEROOT##/meta-security/meta-tpm \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-facebook \ diff --git a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf index 8de7a54d2..03af91001 100644 --- a/meta-facebook/meta-bletchley/conf/machine/bletchley.conf +++ b/meta-facebook/meta-bletchley/conf/machine/bletchley.conf @@ -9,6 +9,7 @@ SPL_BINARY = "spl/u-boot-spl.bin" require conf/machine/include/facebook-nohost.inc require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/facebook-tpm2.inc SERIAL_CONSOLES = "57600;ttyS4" diff --git a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend index f62ffdbc7..5755aa58b 100644 --- a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,3 +1,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" IMAGE_FEATURES:remove:fb-nohost = "obmc-console" + +OBMC_IMAGE_EXTRA_INSTALL:append = "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \ + bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'tpm2-tools', '', d), \ + '', d)} \ + " |