sabrina: wifi: Reflect FW and NVRAM path changes

BCMDHD driver has been updated in order to use Linux firmware
loading API. The paths are now relative to /vendor/firmware/.

Update AP and STA paths as well for HAL awareness.

Change-Id: Iffef47a0dccbdc48cdcec142ba59d282ca9dd760

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 758dca074e1462f904297bf4e3d533cdd73af75b..424731d1392f2d19e0bdbe52764feba1aff1641f 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -32,8 +32,8 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd
 BOARD_WLAN_DEVICE := bcmdhd
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
-WIFI_DRIVER_FW_PATH_AP := "/vendor/etc/wifi/buildin/fw_bcm4356a2_ag_apsta.bin"
-WIFI_DRIVER_FW_PATH_STA := "/vendor/etc/wifi/buildin/fw_bcm4356a2_ag.bin"
+WIFI_DRIVER_FW_PATH_AP := "/wifi/fw_bcm4356a2_ag_apsta.bin"
+WIFI_DRIVER_FW_PATH_STA := "/wifi/fw_bcm4356a2_ag.bin"
 WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path"
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 

diff --git a/init-files/init.amlogic.wifi_buildin.rc b/init-files/init.amlogic.wifi_buildin.rc
index bfdef2ece8d17cee330911cd5758334310aa381a..7ceb6fa1b4a991e83512ad6aedf25e5d7397d7b6 100644 (file)
--- a/init-files/init.amlogic.wifi_buildin.rc
+++ b/init-files/init.amlogic.wifi_buildin.rc
@@ -1,4 +1,4 @@
 import /vendor/etc/init/hw/init.amlogic.sku.rc
 
 on boot
-    insmod /vendor/lib/modules/dhd.ko firmware_path=/vendor/etc/wifi/buildin/ nvram_path=/vendor/etc/wifi/buildin/
+    insmod /vendor/lib/modules/dhd.ko firmware_path=/wifi/ nvram_path=/wifi/