diff options
| author | Ahmed ElArabawy <arabawy@google.com> | 2018-02-09 18:03:14 -0800 |
|---|---|---|
| committer | Ahmed ElArabawy <arabawy@google.com> | 2018-03-29 09:22:48 -0700 |
| commit | d438d71c0dc51267a001953f6a423ab862ff5e92 (patch) | |
| tree | 366cdcd3d0267dcd158d26770012d8c2dcd4bbff | |
| parent | 396dfc170bbf3cb9744d9e675995e4c232df5cf8 (diff) | |
| download | muskie-d438d71c0dc51267a001953f6a423ab862ff5e92.tar.gz | |
WiFi: Switch wifi driver in wahoo into DLKM
Current implementation in wahoo is to build the WiFi driver as a static
module (part of the kernel image)
This commit uses a dynamic linkable Kernel Module which is loaded at
init, and never unloads
Bug: 73177354
Test: Manual test
Change-Id: If605422dfda62ef0bf52b09f519fb9091b5d9ddb
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
| -rw-r--r-- | device-common.mk | 24 | ||||
| -rw-r--r-- | init.insmod.cfg | 1 |
2 files changed, 17 insertions, 8 deletions
diff --git a/device-common.mk b/device-common.mk index ba48390..35126e3 100644 --- a/device-common.mk +++ b/device-common.mk @@ -85,55 +85,63 @@ BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/gcc/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/gcc/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/gcc/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/gcc/htc_battery.ko + device/google/wahoo-kernel/gcc/htc_battery.ko \ + device/google/wahoo-kernel/gcc/wlan.ko else ifeq (,$(filter-out walleye_kasan, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == *_kasan BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kasan/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/kasan/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/kasan/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/kasan/htc_battery.ko + device/google/wahoo-kernel/kasan/htc_battery.ko \ + device/google/wahoo-kernel/kasan/wlan.ko else ifeq (,$(filter-out walleye_kcfi, $(TARGET_PRODUCT))) # if TARGET_PRODUCT == *_kcfi BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/kcfi/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/kcfi/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/kcfi/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/kcfi/htc_battery.ko + device/google/wahoo-kernel/kcfi/htc_battery.ko \ + device/google/wahoo-kernel/kcfi/wlan.ko else ifeq (,$(filter-out walleye_kernel_debug_memory, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_memory BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_memory/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/debug_memory/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/debug_memory/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/debug_memory/htc_battery.ko + device/google/wahoo-kernel/debug_memory/htc_battery.ko \ + device/google/wahoo-kernel/debug_memory/wlan.ko else ifeq (,$(filter-out walleye_kernel_debug_locking, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_locking BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_locking/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/debug_locking/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/debug_locking/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/debug_locking/htc_battery.ko + device/google/wahoo-kernel/debug_locking/htc_battery.ko \ + device/google/wahoo-kernel/debug_locking/wlan.ko else ifeq (,$(filter-out walleye_kernel_debug_hang, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_hang BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_hang/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/debug_hang/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/debug_hang/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/debug_hang/htc_battery.ko + device/google/wahoo-kernel/debug_hang/htc_battery.ko \ + device/google/wahoo-kernel/debug_hang/wlan.ko else ifeq (,$(filter-out walleye_kernel_debug_api, $(TARGET_PRODUCT))) # if TARGET == walleye_kernel_debug_api BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/debug_api/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/debug_api/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/debug_api/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/debug_api/htc_battery.ko + device/google/wahoo-kernel/debug_api/htc_battery.ko \ + device/google/wahoo-kernel/debug_api/wlan.ko else BOARD_VENDOR_KERNEL_MODULES += \ device/google/wahoo-kernel/synaptics_dsx_core_htc.ko \ device/google/wahoo-kernel/synaptics_dsx_rmi_dev_htc.ko \ device/google/wahoo-kernel/synaptics_dsx_fw_update_htc.ko \ - device/google/wahoo-kernel/htc_battery.ko + device/google/wahoo-kernel/htc_battery.ko \ + device/google/wahoo-kernel/wlan.ko endif PRODUCT_COPY_FILES += \ diff --git a/init.insmod.cfg b/init.insmod.cfg index 6d2b325..082948c 100644 --- a/init.insmod.cfg +++ b/init.insmod.cfg @@ -2,3 +2,4 @@ insmod /vendor/lib/modules/synaptics_dsx_core_htc.ko insmod /vendor/lib/modules/synaptics_dsx_fw_update_htc.ko insmod /vendor/lib/modules/synaptics_dsx_rmi_dev_htc.ko insmod /vendor/lib/modules/htc_battery.ko +insmod /vendor/lib/modules/wlan.ko |