From f6d0bb2dfd87db23308ae6aea2c1c67fd9d88d67 Mon Sep 17 00:00:00 2001
From: Tellen Yu<tellen.yu@amlogic.com>
Date: Thu, 26  Oct  2017  05:34:54  +0000
Subject: Merge "wifi: fix multi wifi open fail issue[1/1]" into o-amlogic

---
diff --git a/common/wifi_modules.mk b/common/wifi_modules.mk
new file mode 100644
index 0000000..d47c5e8
--- a/dev/null
+++ b/common/wifi_modules.mk
@@ -0,0 +1,5 @@
+DEFAULT_WIFI_KERNEL_MODULES := \
+        $(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
+	$(PRODUCT_OUT)/obj/lib_vendor/bcmdhd.ko \
+	$(PRODUCT_OUT)/obj/lib_vendor/8822bu.ko \
+        $(PRODUCT_OUT)/obj/lib_vendor/8189es.ko
diff --git a/p212/Kernel.mk b/p212/Kernel.mk
index 44539bc..90adf5e 100644
--- a/p212/Kernel.mk
+++ b/p212/Kernel.mk
@@ -1,6 +1,7 @@
 #if use probuilt kernel or build kernel from source code
 -include device/amlogic/common/gpu.mk
 -include device/amlogic/common/media_modules.mk
+-include device/amlogic/common/wifi_modules.mk
 
 USE_PREBUILT_KERNEL := false
 WIFI_MODULE := multiwifi
@@ -33,10 +34,10 @@ TARGET_AMLOGIC_INT_RECOVERY_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Ima
 
 BOARD_VENDOR_KERNEL_MODULES := \
 	$(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
-	$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/ddr_window_64.ko
 
 BOARD_VENDOR_KERNEL_MODULES	+= $(DEFAULT_MEDIA_KERNEL_MODULES)
+BOARD_VENDOR_KERNEL_MODULES     += $(DEFAULT_WIFI_KERNEL_MODULES)
 
 WIFI_OUT  := $(TARGET_OUT_INTERMEDIATES)/hardware/wifi
 
diff --git a/p230/Kernel.mk b/p230/Kernel.mk
index 0892598..d344f85 100644
--- a/p230/Kernel.mk
+++ b/p230/Kernel.mk
@@ -1,6 +1,8 @@
 #if use probuilt kernel or build kernel from source code
 -include device/amlogic/common/gpu.mk
 -include device/amlogic/common/media_modules.mk
+-include device/amlogic/common/wifi_modules.mk
+
 
 USE_PREBUILT_KERNEL := false
 WIFI_MODULE := bcm4356
@@ -32,10 +34,11 @@ TARGET_AMLOGIC_INT_RECOVERY_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Ima
 
 BOARD_VENDOR_KERNEL_MODULES := \
 	$(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
-	$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/ddr_window_64.ko
 
 BOARD_VENDOR_KERNEL_MODULES += $(DEFAULT_MEDIA_KERNEL_MODULES)
+BOARD_VENDOR_KERNEL_MODULES += $(DEFAULT_WIFI_KERNEL_MODULES)
+
 
 WIFI_OUT  := $(TARGET_OUT_INTERMEDIATES)/hardware/wifi
 
--
cgit