summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChirayu Desai <chirayudesai1@gmail.com>2014-11-19 08:36:25 +0530
committerChirayu Desai <chirayudesai1@gmail.com>2014-11-20 19:08:31 +0530
commit85b3a3d4b8cf9bb0a9a3493df3f234c304dea041 (patch)
tree64cad4ae94cf365dabc6755ca10a8e615f3345fc
parentab1c8c91d0d7b116d3953c5437632fbc06647a02 (diff)
Revert "shinano: wifi: use aosp firmware"
This reverts commit 7adb977d087ab311315bae57534d365098b4d576. Change-Id: I85800845fc4b4d28f8bad5f15abd9533f4a90f6e
-rw-r--r--BoardConfigCommon.mk4
-rw-r--r--proprietary-files.txt4
-rw-r--r--shinano.mk2
3 files changed, 7 insertions, 3 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 5fe9bc7..61419bc 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -112,8 +112,8 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcmdhd.ko"
WIFI_DRIVER_MODULE_NAME := "bcmdhd"
WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path"
-WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin"
-WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin"
+WIFI_DRIVER_FW_PATH_AP := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd_apsta.bin"
+WIFI_DRIVER_FW_PATH_STA := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd.bin"
WIFI_DRIVER_MODULE_ARG := "nvram_path=/system/etc/firmware/wlan/bcmdhd/bcmdhd.cal"
# NFC
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 1be14d5..bd4a2bb 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -392,3 +392,7 @@ bin/clearpad_fwloader
# WiFi
bin/radish
+
+# WiFi firmware
+etc/firmware/wlan/bcmdhd/fw_bcmdhd_apsta.bin
+etc/firmware/wlan/bcmdhd/fw_bcmdhd.bin
diff --git a/shinano.mk b/shinano.mk
index e2736e2..119ed1b 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -228,7 +228,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.sys.wfd.virtual=0
# BCM Wifi
-$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/device-bcm.mk)
+$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/config/config-bcm.mk)
# HWUI memory limits
$(call inherit-product, frameworks/native/build/phone-xxhdpi-2048-hwui-memory.mk)