github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2234 from deitch/kernel-tpm-modules

Browse Source 
[WIP] Add TPM module builder options to kernel
This commit is contained in:
Rolf Neugebauer 2017-07-18 09:59:47 +01:00 committed by GitHub
commit 90d1866bdc
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/kernel_config-4.11.x
View File

@ -2135,6 +2135,7 @@ CONFIG_HW_RANDOM_INTEL=y
CONFIG_HW_RANDOM_AMD=y CONFIG_HW_RANDOM_AMD=y
CONFIG_HW_RANDOM_VIA=y CONFIG_HW_RANDOM_VIA=y
CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_TPM=m
CONFIG_NVRAM=y CONFIG_NVRAM=y
# CONFIG_R3964 is not set # CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set # CONFIG_APPLICOM is not set
@ -2144,7 +2145,20 @@ CONFIG_HPET=y
CONFIG_HPET_MMAP=y CONFIG_HPET_MMAP=y
CONFIG_HPET_MMAP_DEFAULT=y CONFIG_HPET_MMAP_DEFAULT=y
CONFIG_HANGCHECK_TIMER=y CONFIG_HANGCHECK_TIMER=y
# CONFIG_TCG_TPM is not set CONFIG_TCG_TPM=m
CONFIG_TCG_TIS_CORE=m
CONFIG_TCG_TIS=m
CONFIG_TCG_TIS_I2C_ATMEL=m
CONFIG_TCG_TIS_I2C_INFINEON=m
CONFIG_TCG_TIS_I2C_NUVOTON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_XEN=m
CONFIG_TCG_CRB=m
CONFIG_TCG_VTPM_PROXY=m
CONFIG_TCG_TIS_ST33ZP24=m
CONFIG_TCG_TIS_ST33ZP24_I2C=m
# CONFIG_TELCLOCK is not set # CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set # CONFIG_XILLYBUS is not set
@ -3718,6 +3732,7 @@ CONFIG_X86_DEBUG_FPU=y
CONFIG_KEYS=y CONFIG_KEYS=y
CONFIG_PERSISTENT_KEYRINGS=y CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_BIG_KEYS=y CONFIG_BIG_KEYS=y
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=y CONFIG_ENCRYPTED_KEYS=y
CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_DH_OPERATIONS=y
CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY_DMESG_RESTRICT=y

17
kernel/kernel_config-4.9.x
View File

@ -2078,6 +2078,7 @@ CONFIG_HW_RANDOM_INTEL=y
CONFIG_HW_RANDOM_AMD=y CONFIG_HW_RANDOM_AMD=y
CONFIG_HW_RANDOM_VIA=y CONFIG_HW_RANDOM_VIA=y
CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_TPM=m
CONFIG_NVRAM=y CONFIG_NVRAM=y
# CONFIG_R3964 is not set # CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set # CONFIG_APPLICOM is not set
@ -2087,7 +2088,20 @@ CONFIG_HPET=y
CONFIG_HPET_MMAP=y CONFIG_HPET_MMAP=y
CONFIG_HPET_MMAP_DEFAULT=y CONFIG_HPET_MMAP_DEFAULT=y
CONFIG_HANGCHECK_TIMER=y CONFIG_HANGCHECK_TIMER=y
# CONFIG_TCG_TPM is not set CONFIG_TCG_TPM=m
CONFIG_TCG_TIS_CORE=m
CONFIG_TCG_TIS=m
CONFIG_TCG_TIS_I2C_ATMEL=m
CONFIG_TCG_TIS_I2C_INFINEON=m
CONFIG_TCG_TIS_I2C_NUVOTON=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_XEN=m
CONFIG_TCG_CRB=m
CONFIG_TCG_VTPM_PROXY=m
CONFIG_TCG_TIS_ST33ZP24=m
CONFIG_TCG_TIS_ST33ZP24_I2C=m
# CONFIG_TELCLOCK is not set # CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y CONFIG_DEVPORT=y
# CONFIG_XILLYBUS is not set # CONFIG_XILLYBUS is not set
@ -3597,6 +3611,7 @@ CONFIG_X86_DEBUG_FPU=y
CONFIG_KEYS=y CONFIG_KEYS=y
CONFIG_PERSISTENT_KEYRINGS=y CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_BIG_KEYS=y CONFIG_BIG_KEYS=y
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=y CONFIG_ENCRYPTED_KEYS=y
CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_DH_OPERATIONS=y
CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY_DMESG_RESTRICT=y