aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/bcm2708
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-11-19 08:41:25 -0500
committerÁlvaro Fernández Rojas <noltari@gmail.com>2022-11-23 22:35:11 +0100
commit3564c22e46d5b025b174ee9b25291413a4621b21 (patch)
tree1f925bed2d7b6fbdbe174d78c0d4df2e4e364036 /target/linux/bcm27xx/bcm2708
parent353e468f4730b6f24d7da6b62091dc07f29f586f (diff)
downloadupstream-3564c22e46d5b025b174ee9b25291413a4621b21.tar.gz
upstream-3564c22e46d5b025b174ee9b25291413a4621b21.tar.bz2
upstream-3564c22e46d5b025b174ee9b25291413a4621b21.zip
bcm27xx: disable duplicate sdhost driver
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 <therealgraysky@proton.me> [Disable driver for all subtargets, refresh configs, tweak description] Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> (cherry picked from commit 3f7cc9d0144dbc429d19c1801cc6be149f969db9)
Diffstat (limited to 'target/linux/bcm27xx/bcm2708')
-rw-r--r--target/linux/bcm27xx/bcm2708/config-5.106
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/bcm2708/config-5.10 b/target/linux/bcm27xx/bcm2708/config-5.10
index 56e076ba95..5ed6cf81bc 100644
--- a/target/linux/bcm27xx/bcm2708/config-5.10
+++ b/target/linux/bcm27xx/bcm2708/config-5.10
@@ -107,6 +107,7 @@ CONFIG_CPU_V6K=y
CONFIG_CRC16=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_RNG2=y
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_DEBUG_BUGVERBOSE=y
@@ -235,7 +236,7 @@ CONFIG_MFD_SYSCON=y
CONFIG_MIGHT_HAVE_CACHE_L2X0=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
@@ -299,7 +300,6 @@ CONFIG_RESET_CONTROLLER=y
# CONFIG_RESET_RASPBERRYPI is not set
CONFIG_RESET_SIMPLE=y
# CONFIG_RPIVID_MEM is not set
-# CONFIG_RPI_AXIPERF is not set
# CONFIG_RPI_POE_POWER is not set
CONFIG_SCSI=y
# CONFIG_SCSI_LOWLEVEL is not set
@@ -319,8 +319,6 @@ CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SG_POOL=y
CONFIG_SMSC_PHY=y
-# CONFIG_SND_SOC_AD193X_I2C is not set
-# CONFIG_SND_SOC_AD193X_SPI is not set
CONFIG_SPARSE_IRQ=y
CONFIG_SRCU=y
# CONFIG_STRIP_ASM_SYMS is not set