From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg | 8 ++++++++ .../meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc | 3 +++ .../meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg | 6 ++++++ .../meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc | 3 +++ .../recipes-kernel/linux/linux-yocto/tpm_i2c.cfg | 15 +++++++++++++++ .../recipes-kernel/linux/linux-yocto/tpm_i2c.scc | 6 ++++++ .../recipes-kernel/linux/linux-yocto/tpm_x86.cfg | 4 ++++ .../meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg | 5 +++++ .../meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc | 4 ++++ .../recipes-kernel/linux/linux-yocto_4.%.bbappend | 17 +++++++++++++++++ 10 files changed, 71 insertions(+) create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc create mode 100644 meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend (limited to 'meta-security/meta-tpm/recipes-kernel') diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg new file mode 100644 index 000000000..878282398 --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg @@ -0,0 +1,8 @@ +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_SECURITYFS=y +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc new file mode 100644 index 000000000..2949ed4c8 --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc @@ -0,0 +1,3 @@ +define KFEATURE_DESCRIPTION "Enable TPM" + +kconf hardware tpm.cfg diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg new file mode 100644 index 000000000..a81b54d30 --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg @@ -0,0 +1,6 @@ +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_TCG_CRB=y +CONFIG_SECURITYFS=y diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc new file mode 100644 index 000000000..088148fec --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc @@ -0,0 +1,3 @@ +define KFEATURE_DESCRIPTION "Enable TPM 2.0" + +kconf hardware tpm2.cfg diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg new file mode 100644 index 000000000..59993f983 --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg @@ -0,0 +1,15 @@ +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y +CONFIG_SECURITYFS=y + +CONFIG_REGMAP_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_RTC_I2C_AND_SPI=y + +CONFIG_TCG_TIS_I2C_ATMEL=m +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_TIS_ST33ZP24_I2C=m diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc new file mode 100644 index 000000000..0e4eedbf8 --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc @@ -0,0 +1,6 @@ +define KFEATURE_DESCRIPTION "Enable TPM i2c" + +include features/i2c/i2c.scc + +kconf hardware tpm_i2c.cfg + diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg new file mode 100644 index 000000000..8be331a17 --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg @@ -0,0 +1,4 @@ +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_TIS_ST33ZP24=m diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg new file mode 100644 index 000000000..a8b3758a4 --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg @@ -0,0 +1,5 @@ +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TPM=y +CONFIG_TCG_VTPM_PROXY=y +CONFIG_SECURITYFS=y +~ diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc new file mode 100644 index 000000000..e842da6e1 --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable vTPM" + +kconf hardware vtpm.cfg + diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend new file mode 100644 index 000000000..cea8b1b2a --- /dev/null +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend @@ -0,0 +1,17 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" + +# Enable tpm in kernel +SRC_URI_append_x86 = " \ + ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm2.scc', '', d)} \ + " + +SRC_URI_append_x86-64 = " \ + ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'file://tpm2.scc', '', d)} \ + " + +SRC_URI += " \ + ${@bb.utils.contains('MACHINE_FEATURES', 'tpm_i2c', 'file://tpm_i2c.scc', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'vtpm', 'file://vtpm.scc', '', d)} \ + " -- cgit v1.2.3