brcm2708: update to latest patches from RPi foundation
[oweals/openwrt.git] / target / linux / brcm2708 / patches-4.19 / 950-0284-Enable-TPM-TIS-SPI-support-for-TPM1.2-and-TPM2.0-chi.patch
1 From 17e1d4d6f8ce88fccc25c1e900eb985635737959 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 284/806] 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   | 5 +++--
15  arch/arm/configs/bcmrpi_defconfig    | 5 +++--
16  arch/arm64/configs/bcmrpi3_defconfig | 3 +++
17  3 files changed, 9 insertions(+), 4 deletions(-)
18
19 --- a/arch/arm/configs/bcm2709_defconfig
20 +++ b/arch/arm/configs/bcm2709_defconfig
21 @@ -350,7 +350,6 @@ CONFIG_NET_ACT_SKBEDIT=m
22  CONFIG_NET_ACT_CSUM=m
23  CONFIG_BATMAN_ADV=m
24  CONFIG_OPENVSWITCH=m
25 -CONFIG_NET_L3_MASTER_DEV=y
26  CONFIG_NET_PKTGEN=m
27  CONFIG_HAMRADIO=y
28  CONFIG_AX25=m
29 @@ -610,6 +609,8 @@ CONFIG_SERIAL_DEV_BUS=m
30  CONFIG_TTY_PRINTK=y
31  CONFIG_HW_RANDOM=y
32  CONFIG_RAW_DRIVER=y
33 +CONFIG_TCG_TPM=m
34 +CONFIG_TCG_TIS_SPI=m
35  CONFIG_I2C=y
36  CONFIG_I2C_CHARDEV=m
37  CONFIG_I2C_MUX=m
38 @@ -1343,12 +1344,12 @@ CONFIG_NLS_ISO8859_15=m
39  CONFIG_NLS_KOI8_R=m
40  CONFIG_NLS_KOI8_U=m
41  CONFIG_DLM=m
42 +# CONFIG_SECURITYFS is not set
43  CONFIG_CRYPTO_USER=m
44  CONFIG_CRYPTO_CBC=y
45  CONFIG_CRYPTO_CTS=m
46  CONFIG_CRYPTO_XTS=m
47  CONFIG_CRYPTO_XCBC=m
48 -CONFIG_CRYPTO_SHA512=m
49  CONFIG_CRYPTO_TGR192=m
50  CONFIG_CRYPTO_WP512=m
51  CONFIG_CRYPTO_CAST5=m
52 --- a/arch/arm/configs/bcmrpi_defconfig
53 +++ b/arch/arm/configs/bcmrpi_defconfig
54 @@ -344,7 +344,6 @@ CONFIG_NET_ACT_SKBEDIT=m
55  CONFIG_NET_ACT_CSUM=m
56  CONFIG_BATMAN_ADV=m
57  CONFIG_OPENVSWITCH=m
58 -CONFIG_NET_L3_MASTER_DEV=y
59  CONFIG_NET_PKTGEN=m
60  CONFIG_HAMRADIO=y
61  CONFIG_AX25=m
62 @@ -604,6 +603,8 @@ CONFIG_SERIAL_DEV_BUS=m
63  CONFIG_TTY_PRINTK=y
64  CONFIG_HW_RANDOM=y
65  CONFIG_RAW_DRIVER=y
66 +CONFIG_TCG_TPM=m
67 +CONFIG_TCG_TIS_SPI=m
68  CONFIG_I2C=y
69  CONFIG_I2C_CHARDEV=m
70  CONFIG_I2C_MUX=m
71 @@ -1336,13 +1337,13 @@ CONFIG_NLS_ISO8859_15=m
72  CONFIG_NLS_KOI8_R=m
73  CONFIG_NLS_KOI8_U=m
74  CONFIG_DLM=m
75 +# CONFIG_SECURITYFS is not set
76  CONFIG_CRYPTO_USER=m
77  CONFIG_CRYPTO_CRYPTD=m
78  CONFIG_CRYPTO_CBC=y
79  CONFIG_CRYPTO_CTS=m
80  CONFIG_CRYPTO_XTS=m
81  CONFIG_CRYPTO_XCBC=m
82 -CONFIG_CRYPTO_SHA512=m
83  CONFIG_CRYPTO_TGR192=m
84  CONFIG_CRYPTO_WP512=m
85  CONFIG_CRYPTO_CAST5=m
86 --- a/arch/arm64/configs/bcmrpi3_defconfig
87 +++ b/arch/arm64/configs/bcmrpi3_defconfig
88 @@ -589,6 +589,8 @@ CONFIG_SERIAL_DEV_BUS=m
89  CONFIG_TTY_PRINTK=y
90  CONFIG_HW_RANDOM=y
91  CONFIG_RAW_DRIVER=y
92 +CONFIG_TCG_TPM=m
93 +CONFIG_TCG_TIS_SPI=m
94  CONFIG_I2C=y
95  CONFIG_I2C_CHARDEV=m
96  CONFIG_I2C_BCM2708=m
97 @@ -1187,6 +1189,7 @@ CONFIG_NLS_ISO8859_15=m
98  CONFIG_NLS_KOI8_R=m
99  CONFIG_NLS_KOI8_U=m
100  CONFIG_DLM=m
101 +# CONFIG_SECURITYFS is not set
102  CONFIG_CRYPTO_USER=m
103  CONFIG_CRYPTO_CBC=y
104  CONFIG_CRYPTO_CTS=m