From fe8be2ad9b0f701a6ed317be19bdfe79b46cefa2 Mon Sep 17 00:00:00 2001 From: iverson_lee <iverson_lee@asus.com> Date: Sat, 1 Jul 2017 11:39:56 +0800 Subject: [PATCH] Kernel: Wifi: Built-in solution for wifi driver Change-Id: Ib4f345f43708eeb93b11126f99b5d8692a51322a Reviewed-on: http://mcrd1-22-pc.corpnet.asus/code-review/master/308255 Reviewed-by: iverson_lee <iverson_lee@asus.com> Tested-by: iverson_lee <iverson_lee@asus.com> Reviewed-by: Jupiter Chen <jupiter_chen@asus.com> Tested-by: Jupiter Chen <jupiter_chen@asus.com> Reviewed-by: Wu, Meng-Hui <menghui_wu@asus.com> Tested-by: Wu, Meng-Hui <menghui_wu@asus.com> --- arch/arm/configs/sparrow_user_msm8226-perf_defconfig | 2 +- arch/arm/configs/sparrow_userdebug_msm8226_defconfig | 2 +- arch/arm/configs/wren_user_msm8226-perf_defconfig | 2 +- arch/arm/configs/wren_userdebug_msm8226_defconfig | 2 +- drivers/net/wireless/Kconfig | 1 + drivers/net/wireless/Makefile | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/sparrow_user_msm8226-perf_defconfig b/arch/arm/configs/sparrow_user_msm8226-perf_defconfig index ed117c5c02f6..ef35d1623cff 100644 --- a/arch/arm/configs/sparrow_user_msm8226-perf_defconfig +++ b/arch/arm/configs/sparrow_user_msm8226-perf_defconfig @@ -190,7 +190,7 @@ CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_NFC_QNCI=y CONFIG_IPC_ROUTER=y CONFIG_IPC_ROUTER_SECURITY=y -CONFIG_BCMDHD=m +CONFIG_BCMDHD=y CONFIG_BCMDHD_SDIO=y CONFIG_DHD_USE_SCHED_SCAN=y CONFIG_CMA=y diff --git a/arch/arm/configs/sparrow_userdebug_msm8226_defconfig b/arch/arm/configs/sparrow_userdebug_msm8226_defconfig index ffd6c53005bd..24f0af25f1ec 100644 --- a/arch/arm/configs/sparrow_userdebug_msm8226_defconfig +++ b/arch/arm/configs/sparrow_userdebug_msm8226_defconfig @@ -189,7 +189,7 @@ CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_NFC_QNCI=y CONFIG_IPC_ROUTER=y CONFIG_IPC_ROUTER_SECURITY=y -CONFIG_BCMDHD=m +CONFIG_BCMDHD=y CONFIG_BCMDHD_SDIO=y CONFIG_DHD_USE_SCHED_SCAN=y CONFIG_CMA=y diff --git a/arch/arm/configs/wren_user_msm8226-perf_defconfig b/arch/arm/configs/wren_user_msm8226-perf_defconfig index f23c4c27355b..48e2cd62a750 100644 --- a/arch/arm/configs/wren_user_msm8226-perf_defconfig +++ b/arch/arm/configs/wren_user_msm8226-perf_defconfig @@ -190,7 +190,7 @@ CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_NFC_QNCI=y CONFIG_IPC_ROUTER=y CONFIG_IPC_ROUTER_SECURITY=y -CONFIG_BCMDHD=m +CONFIG_BCMDHD=y CONFIG_BCMDHD_SDIO=y CONFIG_DHD_USE_SCHED_SCAN=y CONFIG_CMA=y diff --git a/arch/arm/configs/wren_userdebug_msm8226_defconfig b/arch/arm/configs/wren_userdebug_msm8226_defconfig index 32fb5111ca73..b3042c54d2cc 100644 --- a/arch/arm/configs/wren_userdebug_msm8226_defconfig +++ b/arch/arm/configs/wren_userdebug_msm8226_defconfig @@ -189,7 +189,7 @@ CONFIG_CFG80211_INTERNAL_REGDB=y CONFIG_NFC_QNCI=y CONFIG_IPC_ROUTER=y CONFIG_IPC_ROUTER_SECURITY=y -CONFIG_BCMDHD=m +CONFIG_BCMDHD=y CONFIG_BCMDHD_SDIO=y CONFIG_DHD_USE_SCHED_SCAN=y CONFIG_CMA=y diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 39ec55ced878..ec56b05a1acc 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -370,5 +370,6 @@ source "drivers/net/wireless/rtlwifi/Kconfig" source "drivers/net/wireless/ti/Kconfig" source "drivers/net/wireless/zd1211rw/Kconfig" source "drivers/net/wireless/mwifiex/Kconfig" +source "drivers/net/wireless/bcmdhd/Kconfig" endif # WLAN diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index f2d9d0f1a058..fa9680b63ad4 100755 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -63,5 +63,5 @@ obj-$(CONFIG_WCNSS_CORE) += wcnss/ obj-$(CONFIG_CNSS) += cnss/ # ASUS_BSP+++ Add bcm4343w wlan driver -obj-m += bcmdhd/ +obj-$(CONFIG_BCMDHD) += bcmdhd/ # ASUS_BSP--- Add bcm4343w wlan driver -- GitLab