net: wireless: rockchip_wlan: update for ap6xxx wifi firmware

bcmdhd driver support ko module or compile into kernel

Change-Id: I260c9d3c3da0a9e249a4ee3883ed3efe03964ddf
Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
This commit is contained in:
Xu Xuehui 2017-03-09 11:03:43 +08:00 committed by Huang, Tao
parent 0545b1db57
commit 81d4a9fdbd
4 changed files with 8 additions and 4 deletions

View File

@ -3,3 +3,4 @@ obj-$(CONFIG_RTL8188EU) += rtl8188eu/
obj-$(CONFIG_RTL8188FU) += rtl8188fu/
obj-$(CONFIG_RTL8822BE) += rtl8822be/
obj-$(CONFIG_WL_ROCKCHIP) += wifi_sys/rkwifi_sys_iface.o
obj-$(CONFIG_WL_ROCKCHIP) += rkwifi/rk_wifi_config.o

View File

@ -1,7 +1,6 @@
#rkwifi packed Makefile
# (gwl)
obj-$(CONFIG_AP6XXX) += rk_wifi_config.o
obj-$(CONFIG_AP6XXX) += bcmdhd/
.PHONY: clean

View File

@ -2,7 +2,7 @@
# 1. WL_IFACE_COMB_NUM_CHANNELS must be added if Android version is 4.4 with Kernel version 3.0~3.4,
# otherwise please remove it.
CONFIG_BCMDHD := y
MODULE_NAME = bcmdhd
CONFIG_BCMDHD_SDIO := y
#CONFIG_BCMDHD_PCIE := y
CONFIG_BCMDHD_OOB := y
@ -52,7 +52,7 @@ DHDOFILES += dhd_pcie.o dhd_pcie_linux.o pcie_core.o dhd_flowring.o \
dhd_msgbuf.o
endif
obj-$(CONFIG_BCMDHD) += bcmdhd.o
obj-$(CONFIG_AP6XXX) += bcmdhd.o
bcmdhd-objs += $(DHDOFILES)
#ifeq ($(CONFIG_MACH_ODROID_4210),y)

View File

@ -10065,9 +10065,13 @@ void __exit rockchip_wifi_exit_module_rkwifi(void)
dhd_module_exit();
}
#ifdef CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP
late_initcall(rockchip_wifi_init_module_rkwifi);
module_exit(rockchip_wifi_exit_module_rkwifi);
#else
module_init(rockchip_wifi_init_module_rkwifi);
module_exit(rockchip_wifi_exit_module_rkwifi);
#endif
#if 0
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
#if defined(CONFIG_DEFERRED_INITCALLS)