From 3564c22e46d5b025b174ee9b25291413a4621b21 Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 19 Nov 2022 08:41:25 -0500 Subject: bcm27xx: disable duplicate sdhost driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enabling both CONFIG_MMC_BCM2835 and CONFIG_MMC_BCM2835_SDHOST causes this error in dmesg: Error: Driver 'sdhost-bcm2835' is already registered, aborting... Disabling CONFIG_MMC_BCM2835 and leaving CONFIG_MMC_BCM2835_SDHOST enabled avoids this error. Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia [Disable driver for all subtargets, refresh configs, tweak description] Signed-off-by: Álvaro Fernández Rojas (cherry picked from commit 3f7cc9d0144dbc429d19c1801cc6be149f969db9) --- target/linux/bcm27xx/bcm2710/config-5.10 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'target/linux/bcm27xx/bcm2710/config-5.10') diff --git a/target/linux/bcm27xx/bcm2710/config-5.10 b/target/linux/bcm27xx/bcm2710/config-5.10 index 3a17bd6141..cf76430c57 100644 --- a/target/linux/bcm27xx/bcm2710/config-5.10 +++ b/target/linux/bcm27xx/bcm2710/config-5.10 @@ -136,6 +136,7 @@ CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y @@ -289,7 +290,7 @@ CONFIG_MFD_SYSCON=y CONFIG_MICROCHIP_PHY=y CONFIG_MIGRATION=y CONFIG_MMC=y -CONFIG_MMC_BCM2835=y +# CONFIG_MMC_BCM2835 is not set CONFIG_MMC_BCM2835_DMA=y CONFIG_MMC_BCM2835_MMC=y CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2 @@ -370,7 +371,6 @@ CONFIG_RESET_SIMPLE=y CONFIG_RFS_ACCEL=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_RPIVID_MEM is not set -# CONFIG_RPI_AXIPERF is not set # CONFIG_RPI_POE_POWER is not set CONFIG_RPS=y CONFIG_RWSEM_SPIN_ON_OWNER=y @@ -393,8 +393,6 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SMSC_PHY=y -# CONFIG_SND_SOC_AD193X_I2C is not set -# CONFIG_SND_SOC_AD193X_SPI is not set CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_MANUAL=y -- cgit v1.2.3