diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-12-26 00:18:09 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-12-26 00:18:09 +0000 |
| commit | d735d98303efc1546540c948fa426138676fab1d (patch) | |
| tree | 7eea0910fc5b1133b968deaf2d0b13d24a4640d8 | |
| parent | c04a6d9e9389d34ab05e47a3b62cbb8adc825436 (diff) | |
| parent | ca4ccd87d3dd8715183c00efe2e16e51188c8503 (diff) | |
| download | kernel_replicant_linux-d735d98303efc1546540c948fa426138676fab1d.tar.gz kernel_replicant_linux-d735d98303efc1546540c948fa426138676fab1d.tar.bz2 kernel_replicant_linux-d735d98303efc1546540c948fa426138676fab1d.zip | |
Merge branch 'master' into 'master'
[cloud-amd64] tpm: Enable TPM drivers for Cloud (Closes: #946237)
See merge request kernel-team/linux!191
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config/amd64/config.cloud-amd64 | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8a097a25b1b5..17033805babb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -356,6 +356,9 @@ linux (5.4.6-1~exp1) UNRELEASED; urgency=medium - drm/amdgpu: add invalidate semaphore limit for SRIOV and picasso in gmc9 - ALSA: hda: Fix regression by strip mask fix + [ Joe Richey ] + * [cloud-amd64] tpm: Enable TPM drivers for Cloud (Closes: #946237) + [ Ben Hutchings ] * [armel/rpi,armhf,arm64] Enable DEBUG_WX diff --git a/debian/config/amd64/config.cloud-amd64 b/debian/config/amd64/config.cloud-amd64 index b71225db1971..26002df08717 100644 --- a/debian/config/amd64/config.cloud-amd64 +++ b/debian/config/amd64/config.cloud-amd64 @@ -176,7 +176,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 |