git.openwrt.org Git - openwrt/staging/981213.git/blob

   1 From 9bd7df848d7e683eb78637286a00af1c86dee361 Mon Sep 17 00:00:00 2001
   2 From: Peter Huewe <peterhuewe@gmx.de>
   3 Date: Thu, 14 Jun 2018 22:42:18 +0200
   4 Subject: [PATCH 448/454] Enable TPM TIS SPI support for TPM1.2 and TPM2.0
   5  chips
   6
   7 This patch enables the support for SPI TPMs which follow the TCG TIS
   8 FIFO/PTP specification like the SLB9670.
   9 In order to decrease ram usage the weak dependency on CONFIG_SECURITFS
  10 is explictly set to 'n'.
  11
  12 Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
  13 ---
  14  arch/arm/configs/bcm2709_defconfig   |  3 +++
  15  arch/arm/configs/bcmrpi_defconfig    |  3 +++
  16  arch/arm64/configs/bcmrpi3_defconfig | 11 ++++++-----
  17  3 files changed, 12 insertions(+), 5 deletions(-)
  18
  19 --- a/arch/arm/configs/bcm2709_defconfig
  20 +++ b/arch/arm/configs/bcm2709_defconfig
  21 @@ -607,6 +607,8 @@ CONFIG_SERIAL_DEV_BUS=m
  22  CONFIG_TTY_PRINTK=y
  23  CONFIG_HW_RANDOM=y
  24  CONFIG_RAW_DRIVER=y
  25 +CONFIG_TCG_TPM=m
  26 +CONFIG_TCG_TIS_SPI=m
  27  CONFIG_I2C=y
  28  CONFIG_I2C_CHARDEV=m
  29  CONFIG_I2C_MUX_GPMUX=m
  30 @@ -1361,6 +1363,7 @@ CONFIG_FUNCTION_PROFILER=y
  31  CONFIG_KGDB=y
  32  CONFIG_KGDB_KDB=y
  33  CONFIG_KDB_KEYBOARD=y
  34 +# CONFIG_SECURITYFS is not set
  35  CONFIG_CRYPTO_USER=m
  36  CONFIG_CRYPTO_CBC=y
  37  CONFIG_CRYPTO_CTS=m
  38 --- a/arch/arm/configs/bcmrpi_defconfig
  39 +++ b/arch/arm/configs/bcmrpi_defconfig
  40 @@ -602,6 +602,8 @@ CONFIG_SERIAL_DEV_BUS=m
  41  CONFIG_TTY_PRINTK=y
  42  CONFIG_HW_RANDOM=y
  43  CONFIG_RAW_DRIVER=y
  44 +CONFIG_TCG_TPM=m
  45 +CONFIG_TCG_TIS_SPI=m
  46  CONFIG_I2C=y
  47  CONFIG_I2C_CHARDEV=m
  48  CONFIG_I2C_MUX_GPMUX=m
  49 @@ -1353,6 +1355,7 @@ CONFIG_FUNCTION_PROFILER=y
  50  CONFIG_KGDB=y
  51  CONFIG_KGDB_KDB=y
  52  CONFIG_KDB_KEYBOARD=y
  53 +# CONFIG_SECURITYFS is not set
  54  CONFIG_CRYPTO_USER=m
  55  CONFIG_CRYPTO_CRYPTD=m
  56  CONFIG_CRYPTO_CBC=y
  57 --- a/arch/arm64/configs/bcmrpi3_defconfig
  58 +++ b/arch/arm64/configs/bcmrpi3_defconfig
  59 @@ -98,6 +98,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
  60  CONFIG_INET_XFRM_MODE_TUNNEL=m
  61  CONFIG_INET_XFRM_MODE_BEET=m
  62  CONFIG_INET_DIAG=m
  63 +CONFIG_TCP_CONG_ADVANCED=y
  64 +CONFIG_TCP_CONG_BBR=m
  65  CONFIG_IPV6=m
  66  CONFIG_IPV6_ROUTER_PREF=y
  67  CONFIG_INET6_AH=m
  68 @@ -306,11 +308,9 @@ CONFIG_NET_SCH_CHOKE=m
  69  CONFIG_NET_SCH_QFQ=m
  70  CONFIG_NET_SCH_CODEL=m
  71  CONFIG_NET_SCH_FQ_CODEL=m
  72 +CONFIG_NET_SCH_FQ=m
  73  CONFIG_NET_SCH_INGRESS=m
  74  CONFIG_NET_SCH_PLUG=m
  75 -CONFIG_NET_SCH_FQ=m
  76 -CONFIG_TCP_CONG_ADVANCED=y
  77 -CONFIG_TCP_CONG_BBR=m
  78  CONFIG_NET_CLS_BASIC=m
  79  CONFIG_NET_CLS_TCINDEX=m
  80  CONFIG_NET_CLS_ROUTE4=m
  81 @@ -586,6 +586,8 @@ CONFIG_SERIAL_DEV_BUS=m
  82  CONFIG_TTY_PRINTK=y
  83  CONFIG_HW_RANDOM=y
  84  CONFIG_RAW_DRIVER=y
  85 +CONFIG_TCG_TPM=m
  86 +CONFIG_TCG_TIS_SPI=m
  87  CONFIG_I2C=y
  88  CONFIG_I2C_CHARDEV=m
  89  CONFIG_I2C_MUX_PCA954x=m
  90 @@ -1265,6 +1267,7 @@ CONFIG_FUNCTION_PROFILER=y
  91  CONFIG_KGDB=y
  92  CONFIG_KGDB_KDB=y
  93  CONFIG_KDB_KEYBOARD=y
  94 +# CONFIG_SECURITYFS is not set
  95  CONFIG_CRYPTO_USER=m
  96  CONFIG_CRYPTO_CBC=y
  97  CONFIG_CRYPTO_CTS=m
  98 @@ -1277,8 +1280,6 @@ CONFIG_CRYPTO_DES=y
  99  CONFIG_CRYPTO_LZ4=m
 100  CONFIG_CRYPTO_USER_API_SKCIPHER=m
 101  CONFIG_ARM64_CRYPTO=y
 102 -CONFIG_CRYPTO_AES_ARM64=m
 103  CONFIG_CRYPTO_AES_ARM64_BS=m
 104 -CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
 105  CONFIG_CRC_ITU_T=y
 106  CONFIG_LIBCRC32C=y