| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-10-26 05:34:54 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-10-26 05:34:54 (GMT) |
| commit | f6d0bb2dfd87db23308ae6aea2c1c67fd9d88d67 (patch) | |
| tree | 20faa6afd9ef383c71cc0a582d83371eac0dbf79 | |
| parent | e65d6ebd063c0e69cf8603d3f85e2e4ce972d23d (diff) | |
| parent | 30b0929ad95a9bfcef4252ab64c91da0d03a106f (diff) | |
| download | amlogic-o-f6d0bb2dfd87db23308ae6aea2c1c67fd9d88d67.zip amlogic-o-f6d0bb2dfd87db23308ae6aea2c1c67fd9d88d67.tar.gz amlogic-o-f6d0bb2dfd87db23308ae6aea2c1c67fd9d88d67.tar.bz2 | |
Merge "wifi: fix multi wifi open fail issue[1/1]" into o-amlogic
| -rw-r--r-- | common/wifi_modules.mk | 5 | ||||
| -rw-r--r-- | p212/Kernel.mk | 3 | ||||
| -rw-r--r-- | p230/Kernel.mk | 5 |
3 files changed, 11 insertions, 2 deletions
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 |