aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiulio Cervera <giulio.cervera@cyanogenmod.org>2014-10-27 22:25:16 +0100
committerGiulio Cervera <giulio.cervera@cyanogenmod.org>2014-10-27 23:10:00 +0100
commit7adb977d087ab311315bae57534d365098b4d576 (patch)
tree13ed164938e16399decc1cffef1a899a6bd835c1
parent475906df8064344adc96e4c516a2e11bf83ccbd7 (diff)
shinano: wifi: use aosp firmware
Change-Id: I1c8a0990505c8e6d4cfd78c2285c32e357ee393f
-rw-r--r--BoardConfigCommon.mk4
-rw-r--r--proprietary-files.txt4
-rw-r--r--shinano.mk2
3 files changed, 3 insertions, 7 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ea5848b..c2a5ecb 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -122,8 +122,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 := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd_apsta.bin"
-WIFI_DRIVER_FW_PATH_STA := "/system/etc/firmware/wlan/bcmdhd/fw_bcmdhd.bin"
+WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin"
+WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin"
WIFI_DRIVER_MODULE_ARG := "nvram_path=/system/etc/firmware/wlan/bcmdhd/bcmdhd.cal"
# Filesystem
diff --git a/proprietary-files.txt b/proprietary-files.txt
index f7d7147..84289bf 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -397,7 +397,3 @@ 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 149d369..42e7d26 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -240,7 +240,7 @@ PRODUCT_PACKAGES += \
CameraWorkaround
# BCM Wifi
-$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/config/config-bcm.mk)
+$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/device-bcm.mk)
# Include non-opensource parts
$(call inherit-product, vendor/sony/shinano-common/shinano-common-vendor.mk)