Merge branch 'buster' into 'buster'

[buster] [cloud-amd64] tpm: Enable TPM drivers for Cloud (Closes: #946237)

See merge request kernel-team/linux!189
This commit is contained in:
Ben Hutchings 2020-01-18 23:59:40 +00:00
commit 1016f4dae9
2 changed files with 20 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
linux (4.19.87-2) UNRELEASED; urgency=medium
[ Joe Richey ]
* [cloud-amd64] tpm: Enable TPM drivers for Cloud (Closes: #946237)
-- Joe Richey <joerichey@google.com> Thu, 05 Dec 2019 17:38:37 -0800
linux (4.19.87-1) buster; urgency=medium
* New upstream stable update:

View File

@ -185,7 +185,19 @@ CONFIG_XEN_BLKDEV_FRONTEND=m
##
## file: drivers/char/tpm/Kconfig
##
# CONFIG_TCG_TPM is not set
CONFIG_TCG_TPM=m
# CONFIG_HW_RANDOM_TPM is not set
CONFIG_TCG_TIS=m
# CONFIG_TCG_TIS_SPI is not set
# CONFIG_TCG_TIS_I2C_ATMEL is not set
# CONFIG_TCG_TIS_I2C_INFINEON is not set
# CONFIG_TCG_TIS_I2C_NUVOTON is not set
# CONFIG_TCG_NSC is not set
# CONFIG_TCG_ATMEL is not set
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_XEN=m
CONFIG_TCG_CRB=m
CONFIG_TCG_VTPM_PROXY=m
##
## file: drivers/char/xillybus/Kconfig