From 9ae1532dd2473791d334f7f4758d7ef7a1cbbe66 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 15 Mar 2024 14:49:47 +0100 Subject: [PATCH] sys-kernel/coreos-modules: Enable TPM TIS drivers for arm64 The arm64 kernel didn't have TPM support for the qemu TPM2 TIS software TPM. This moves the TPM TIS kernel module enablement to the common config of both architectures. In addition it enables the SPI and I2C drivers. --- .../sys-kernel/coreos-modules/files/amd64_defconfig-6.6 | 1 - .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 index fb2516df3bb..4669f47a338 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 @@ -108,7 +108,6 @@ CONFIG_SENSORS_K8TEMP=m CONFIG_STACK_TRACER=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m -CONFIG_TCG_TIS=m CONFIG_UPROBE_EVENTS=y CONFIG_USB_OHCI_HCD_SSB=y CONFIG_VFIO=m diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index 0d64613f27d..153b0709356 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -861,9 +861,12 @@ CONFIG_TASKSTATS=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_XACCT=y CONFIG_TCG_ATMEL=m +CONFIG_TCG_TIS=m +CONFIG_TCG_TIS_I2C=m CONFIG_TCG_TIS_I2C_ATMEL=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m +CONFIG_TCG_TIS_I2C_SPI=m CONFIG_TCG_VTPM_PROXY=m CONFIG_TCG_XEN=m CONFIG_TCM_FILEIO=m