From 17e1d4d6f8ce88fccc25c1e900eb985635737959 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Thu, 14 Jun 2018 22:42:18 +0200 Subject: [PATCH 284/806] Enable TPM TIS SPI support for TPM1.2 and TPM2.0 chips This patch enables the support for SPI TPMs which follow the TCG TIS FIFO/PTP specification like the SLB9670. In order to decrease ram usage the weak dependency on CONFIG_SECURITFS is explictly set to 'n'. Signed-off-by: Peter Huewe --- arch/arm/configs/bcm2709_defconfig | 5 +++-- arch/arm/configs/bcmrpi_defconfig | 5 +++-- arch/arm64/configs/bcmrpi3_defconfig | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -350,7 +350,6 @@ CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_CSUM=m CONFIG_BATMAN_ADV=m CONFIG_OPENVSWITCH=m -CONFIG_NET_L3_MASTER_DEV=y CONFIG_NET_PKTGEN=m CONFIG_HAMRADIO=y CONFIG_AX25=m @@ -610,6 +609,8 @@ CONFIG_SERIAL_DEV_BUS=m CONFIG_TTY_PRINTK=y CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS_SPI=m CONFIG_I2C=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX=m @@ -1343,12 +1344,12 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_DLM=m +# CONFIG_SECURITYFS is not set CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_CAST5=m --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -344,7 +344,6 @@ CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_CSUM=m CONFIG_BATMAN_ADV=m CONFIG_OPENVSWITCH=m -CONFIG_NET_L3_MASTER_DEV=y CONFIG_NET_PKTGEN=m CONFIG_HAMRADIO=y CONFIG_AX25=m @@ -604,6 +603,8 @@ CONFIG_SERIAL_DEV_BUS=m CONFIG_TTY_PRINTK=y CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS_SPI=m CONFIG_I2C=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_MUX=m @@ -1336,13 +1337,13 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_DLM=m +# CONFIG_SECURITYFS is not set CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_CAST5=m --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -589,6 +589,8 @@ CONFIG_SERIAL_DEV_BUS=m CONFIG_TTY_PRINTK=y CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y +CONFIG_TCG_TPM=m +CONFIG_TCG_TIS_SPI=m CONFIG_I2C=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_BCM2708=m @@ -1187,6 +1189,7 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_DLM=m +# CONFIG_SECURITYFS is not set CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=m