author | Tellen Yu <tellen.yu@amlogic.com> | 2017-12-29 05:42:52 (GMT) |
---|---|---|
committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-12-29 05:42:52 (GMT) |
commit | ec4b36bcfe182608e8ccb40db931f5c545bd534a (patch) | |
tree | f8fbd6160d82179be5b72eace8dc8f747aa20942 | |
parent | 51eead62d998628d1223603130aaefea80481772 (diff) | |
parent | c6fb0cc377544486f0dc4b8b7db3f30064fc3029 (diff) | |
download | common-ec4b36bcfe182608e8ccb40db931f5c545bd534a.zip common-ec4b36bcfe182608e8ccb40db931f5c545bd534a.tar.gz common-ec4b36bcfe182608e8ccb40db931f5c545bd534a.tar.bz2 |
Merge "wifi:change BOARD_WLAN_DEVICE for bcm4356[2/2]" into o-ref-amlogic
-rw-r--r-- | wifi.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -110,7 +110,7 @@ WIFI_DRIVER_FW_PATH_STA := /vendor/etc/wifi/4356/fw_bcm4356a2_ag.bin WIFI_DRIVER_FW_PATH_AP := /vendor/etc/wifi/4356/fw_bcm4356a2_ag_apsta.bin WIFI_DRIVER_FW_PATH_P2P := /vendor/etc/wifi/4356/fw_bcm4356a2_ag_p2p.bin -BOARD_WLAN_DEVICE := bcmdhd +BOARD_WLAN_DEVICE := MediaTek WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path" WPA_SUPPLICANT_VERSION := VER_0_8_X @@ -131,6 +131,7 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc +PRODUCT_COPY_FILES += hardware/amlogic/wifi/multi_wifi/config/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko |