mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
107 lines
2.9 KiB
Diff
107 lines
2.9 KiB
Diff
From 9bd7df848d7e683eb78637286a00af1c86dee361 Mon Sep 17 00:00:00 2001
|
|
From: Peter Huewe <peterhuewe@gmx.de>
|
|
Date: Thu, 14 Jun 2018 22:42:18 +0200
|
|
Subject: [PATCH 448/454] 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 <peterhuewe@gmx.de>
|
|
---
|
|
arch/arm/configs/bcm2709_defconfig | 3 +++
|
|
arch/arm/configs/bcmrpi_defconfig | 3 +++
|
|
arch/arm64/configs/bcmrpi3_defconfig | 11 ++++++-----
|
|
3 files changed, 12 insertions(+), 5 deletions(-)
|
|
|
|
--- a/arch/arm/configs/bcm2709_defconfig
|
|
+++ b/arch/arm/configs/bcm2709_defconfig
|
|
@@ -607,6 +607,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_GPMUX=m
|
|
@@ -1361,6 +1363,7 @@ CONFIG_FUNCTION_PROFILER=y
|
|
CONFIG_KGDB=y
|
|
CONFIG_KGDB_KDB=y
|
|
CONFIG_KDB_KEYBOARD=y
|
|
+# CONFIG_SECURITYFS is not set
|
|
CONFIG_CRYPTO_USER=m
|
|
CONFIG_CRYPTO_CBC=y
|
|
CONFIG_CRYPTO_CTS=m
|
|
--- a/arch/arm/configs/bcmrpi_defconfig
|
|
+++ b/arch/arm/configs/bcmrpi_defconfig
|
|
@@ -602,6 +602,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_GPMUX=m
|
|
@@ -1353,6 +1355,7 @@ CONFIG_FUNCTION_PROFILER=y
|
|
CONFIG_KGDB=y
|
|
CONFIG_KGDB_KDB=y
|
|
CONFIG_KDB_KEYBOARD=y
|
|
+# CONFIG_SECURITYFS is not set
|
|
CONFIG_CRYPTO_USER=m
|
|
CONFIG_CRYPTO_CRYPTD=m
|
|
CONFIG_CRYPTO_CBC=y
|
|
--- a/arch/arm64/configs/bcmrpi3_defconfig
|
|
+++ b/arch/arm64/configs/bcmrpi3_defconfig
|
|
@@ -98,6 +98,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
|
|
CONFIG_INET_XFRM_MODE_TUNNEL=m
|
|
CONFIG_INET_XFRM_MODE_BEET=m
|
|
CONFIG_INET_DIAG=m
|
|
+CONFIG_TCP_CONG_ADVANCED=y
|
|
+CONFIG_TCP_CONG_BBR=m
|
|
CONFIG_IPV6=m
|
|
CONFIG_IPV6_ROUTER_PREF=y
|
|
CONFIG_INET6_AH=m
|
|
@@ -306,11 +308,9 @@ CONFIG_NET_SCH_CHOKE=m
|
|
CONFIG_NET_SCH_QFQ=m
|
|
CONFIG_NET_SCH_CODEL=m
|
|
CONFIG_NET_SCH_FQ_CODEL=m
|
|
+CONFIG_NET_SCH_FQ=m
|
|
CONFIG_NET_SCH_INGRESS=m
|
|
CONFIG_NET_SCH_PLUG=m
|
|
-CONFIG_NET_SCH_FQ=m
|
|
-CONFIG_TCP_CONG_ADVANCED=y
|
|
-CONFIG_TCP_CONG_BBR=m
|
|
CONFIG_NET_CLS_BASIC=m
|
|
CONFIG_NET_CLS_TCINDEX=m
|
|
CONFIG_NET_CLS_ROUTE4=m
|
|
@@ -586,6 +586,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_PCA954x=m
|
|
@@ -1265,6 +1267,7 @@ CONFIG_FUNCTION_PROFILER=y
|
|
CONFIG_KGDB=y
|
|
CONFIG_KGDB_KDB=y
|
|
CONFIG_KDB_KEYBOARD=y
|
|
+# CONFIG_SECURITYFS is not set
|
|
CONFIG_CRYPTO_USER=m
|
|
CONFIG_CRYPTO_CBC=y
|
|
CONFIG_CRYPTO_CTS=m
|
|
@@ -1277,8 +1280,6 @@ CONFIG_CRYPTO_DES=y
|
|
CONFIG_CRYPTO_LZ4=m
|
|
CONFIG_CRYPTO_USER_API_SKCIPHER=m
|
|
CONFIG_ARM64_CRYPTO=y
|
|
-CONFIG_CRYPTO_AES_ARM64=m
|
|
CONFIG_CRYPTO_AES_ARM64_BS=m
|
|
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
|
|
CONFIG_CRC_ITU_T=y
|
|
CONFIG_LIBCRC32C=y
|