]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
projects / thirdparty / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8dde1e4)
bcm27xx: switch to upstream SDHOST driver 18866/head
authorÁlvaro Fernández Rojas <noltari@gmail.com>
Wed, 21 May 2025 10:28:44 +0000 (12:28 +0200)
committerÁlvaro Fernández Rojas <noltari@gmail.com>
Wed, 21 May 2025 11:59:16 +0000 (13:59 +0200)
The RPi upstream repo switched to the upstream SDHOST driver some time ago, so
it's time to do the same in our configs.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
target/linux/bcm27xx/bcm2708/config-6.12 patch | blob | blame | history
target/linux/bcm27xx/bcm2708/config-6.6 patch | blob | blame | history
target/linux/bcm27xx/bcm2709/config-6.12 patch | blob | blame | history
target/linux/bcm27xx/bcm2709/config-6.6 patch | blob | blame | history
target/linux/bcm27xx/bcm2710/config-6.12 patch | blob | blame | history
target/linux/bcm27xx/bcm2710/config-6.6 patch | blob | blame | history
target/linux/bcm27xx/bcm2711/config-6.12 patch | blob | blame | history
target/linux/bcm27xx/bcm2711/config-6.6 patch | blob | blame | history
target/linux/bcm27xx/bcm2712/config-6.12 patch | blob | blame | history
target/linux/bcm27xx/bcm2712/config-6.6 patch | blob | blame | history

diff --git a/target/linux/bcm27xx/bcm2708/config-6.12 b/target/linux/bcm27xx/bcm2708/config-6.12
index 0f556a2194f6b49d800040bff870bd7713c760af..6c68113c8bfed08066bf75a0170c78f2b2e55811 100644 (file)
--- a/target/linux/bcm27xx/bcm2708/config-6.12
+++ b/target/linux/bcm27xx/bcm2708/config-6.12
@@ -252,11 +252,11 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_HSQ=y
diff --git a/target/linux/bcm27xx/bcm2708/config-6.6 b/target/linux/bcm27xx/bcm2708/config-6.6
index 6f569d1b930dea9a3e7dd126f7e380567b939319..a45c702267375d685a719c2347849cf7b9208a46 100644 (file)
--- a/target/linux/bcm27xx/bcm2708/config-6.6
+++ b/target/linux/bcm27xx/bcm2708/config-6.6
@@ -249,11 +249,11 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_HSQ=y
diff --git a/target/linux/bcm27xx/bcm2709/config-6.12 b/target/linux/bcm27xx/bcm2709/config-6.12
index 04257490790f4474e8135ec09dfbe24cf97b5627..0e448f851b71834be587484d648909ed2ad53afc 100644 (file)
--- a/target/linux/bcm27xx/bcm2709/config-6.12
+++ b/target/linux/bcm27xx/bcm2709/config-6.12
@@ -318,11 +318,11 @@ CONFIG_MICROCHIP_PHY=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_HSQ=y
diff --git a/target/linux/bcm27xx/bcm2709/config-6.6 b/target/linux/bcm27xx/bcm2709/config-6.6
index 5688c4894ee6af8e6417c2ce28ed219bfb2544bf..076a29836886e7414274ed6e6a78bf4ade705bec 100644 (file)
--- a/target/linux/bcm27xx/bcm2709/config-6.6
+++ b/target/linux/bcm27xx/bcm2709/config-6.6
@@ -140,6 +140,9 @@ CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_GENIV=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
+CONFIG_CRYPTO_JITTERENTROPY_OSR=1
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_SHA1=y
@@ -312,11 +315,11 @@ CONFIG_MICROCHIP_PHY=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_HSQ=y
diff --git a/target/linux/bcm27xx/bcm2710/config-6.12 b/target/linux/bcm27xx/bcm2710/config-6.12
index 05eca20972c5d9b32135c5b134b2c8dab253b130..436c59f5f90f606acf9a4bb6630e42096fe4f7f0 100644 (file)
--- a/target/linux/bcm27xx/bcm2710/config-6.12
+++ b/target/linux/bcm27xx/bcm2710/config-6.12
@@ -321,11 +321,11 @@ CONFIG_MICROCHIP_PHY=y
 CONFIG_MIGRATION=y
 # CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_HSQ=y
diff --git a/target/linux/bcm27xx/bcm2710/config-6.6 b/target/linux/bcm27xx/bcm2710/config-6.6
index 2f7e3aa2f8aaf8f750d10d07e92a4e0f533c6016..e5bacbab836792cdf83a4a6725dc54f9fa2f5625 100644 (file)
--- a/target/linux/bcm27xx/bcm2710/config-6.6
+++ b/target/linux/bcm27xx/bcm2710/config-6.6
@@ -147,6 +147,9 @@ CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_GENIV=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
+CONFIG_CRYPTO_JITTERENTROPY_OSR=1
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_SHA1=y
@@ -310,11 +313,11 @@ CONFIG_MICROCHIP_PHY=y
 CONFIG_MIGRATION=y
 # CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_HSQ=y
diff --git a/target/linux/bcm27xx/bcm2711/config-6.12 b/target/linux/bcm27xx/bcm2711/config-6.12
index 9ae3cd349966e32f46a0c74c7fb1e9bae2d8e235..f65854169810b61b390f5d6f0586f6b16fa85f86 100644 (file)
--- a/target/linux/bcm27xx/bcm2711/config-6.12
+++ b/target/linux/bcm27xx/bcm2711/config-6.12
@@ -322,11 +322,11 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_HSQ=y
diff --git a/target/linux/bcm27xx/bcm2711/config-6.6 b/target/linux/bcm27xx/bcm2711/config-6.6
index a48771b8e7086392777949092c5ff50a61e069bd..e36b33073caa6dacebd90e860e29c94fb5b3e738 100644 (file)
--- a/target/linux/bcm27xx/bcm2711/config-6.6
+++ b/target/linux/bcm27xx/bcm2711/config-6.6
@@ -146,6 +146,9 @@ CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_GENIV=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
+CONFIG_CRYPTO_JITTERENTROPY_OSR=1
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_SHA1=y
@@ -313,11 +316,11 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_HSQ=y
diff --git a/target/linux/bcm27xx/bcm2712/config-6.12 b/target/linux/bcm27xx/bcm2712/config-6.12
index 6b45fcfd7d94f737711d805ba18afb8b8b47a7da..a69aa66ce9c176511d78162c255d20af2f68a892 100644 (file)
--- a/target/linux/bcm27xx/bcm2712/config-6.12
+++ b/target/linux/bcm27xx/bcm2712/config-6.12
@@ -398,11 +398,11 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MICROCHIP_PHY=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_CQHCI=y
diff --git a/target/linux/bcm27xx/bcm2712/config-6.6 b/target/linux/bcm27xx/bcm2712/config-6.6
index bd36c406370a9f5ed2827d22b8347932f37d62fe..46e79c776e07911375c23059043e52cf76da4d82 100644 (file)
--- a/target/linux/bcm27xx/bcm2712/config-6.6
+++ b/target/linux/bcm27xx/bcm2712/config-6.6
@@ -178,6 +178,9 @@ CONFIG_CRYPTO_GENIV=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
+CONFIG_CRYPTO_JITTERENTROPY_OSR=1
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_SHA1=y
@@ -389,11 +392,11 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MICROCHIP_PHY=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
+CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_MMC=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
+# CONFIG_MMC_BCM2835_SDHOST is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_CQHCI=y
Mirror of https://github.com/openwrt/openwrt.git