From 277dbca2d388dda39d4063d65b50c59b627359c3 Mon Sep 17 00:00:00 2001 From: Brendan Szymanski Date: Sun, 12 Jul 2026 23:44:38 -0400 Subject: [PATCH] Disable bcmdhd and rockchip_wlan in favor of brcmfmac --- arch/arm64/configs/tart_defconfig | 11 +++++------ drivers/net/wireless/Kconfig | 1 - .../net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/arm64/configs/tart_defconfig b/arch/arm64/configs/tart_defconfig index 92dfd0273..da4586933 100644 --- a/arch/arm64/configs/tart_defconfig +++ b/arch/arm64/configs/tart_defconfig @@ -3454,14 +3454,13 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=n CONFIG_WLAN_VENDOR_BROADCOM=y CONFIG_BRCMUTIL=y CONFIG_BRCMSMAC=y -CONFIG_BCMDHD=y -CONFIG_WL_ROCKCHIP=y +CONFIG_BCMDHD=n +CONFIG_WL_ROCKCHIP=n CONFIG_AP6XXX=y +#CONFIG_BCMDHD_SDIO=y CONFIG_BCMDHD_SDIO=y -# CONFIG_BCMDHD_PCIE is not set -CONFIG_BCMDHD_DEBUG=n -CONFIG_BCMDHD_FW_PATH="/vendor/firmware/brcm/fw_bcmdhd.bin" -CONFIG_BCMDHD_NVRAM_PATH="/vendor/firmware/brcm/nvram.txt" +# CONFIG_BCMDHD_FW_PATH is not set +# CONFIG_BCMDHD_NVRAM_PATH is not set CONFIG_BRCMFMAC=y CONFIG_BRCMFMAC_PROTO_BCDC=y CONFIG_BRCMFMAC_PROTO_MSGBUF=y diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 3d66a208a..c6599594d 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -36,7 +36,6 @@ source "drivers/net/wireless/st/Kconfig" source "drivers/net/wireless/ti/Kconfig" source "drivers/net/wireless/zydas/Kconfig" source "drivers/net/wireless/quantenna/Kconfig" -source "drivers/net/wireless/rockchip_wlan/Kconfig" source "drivers/net/wireless/virtual/Kconfig" diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile index f566fdf00..afde1f4c6 100755 --- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/Makefile @@ -413,7 +413,7 @@ endif ifeq ($(CONFIG_BCMDHD_AUTO_SELECT),y) DHDCFLAGS += -DUPDATE_MODULE_NAME ifeq ($(CONFIG_BCMDHD_REQUEST_FW),y) - DHDCFLAGS += -DFW_AMPAK_PATH="\"vendor/firmware/brcm\"" +# DHDCFLAGS += -DFW_AMPAK_PATH="\"ampak\"" # DHDCFLAGS += -DMODULE_PATH endif ifneq ($(CONFIG_BCMDHD_SDIO),)