Merge pull request #1755 from flatcar/scripts

sys-kernel/coreos-modules: Enable TPM TIS drivers for arm64
flatcar · Apr 15, 2024 · 1a6252f · 1a6252f
2 parents 8a55b9e + d6dfbe2
commit 1a6252f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/...tainer/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 b/...tainer/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/...container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/...container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6
@@ -861,6 +861,7 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TASK_XACCT=y
 CONFIG_TCG_ATMEL=m
+CONFIG_TCG_TIS=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
 CONFIG_TCG_TIS_I2C_NUVOTON=m