commit fc92df96afc985c724ed8b1ff2c17c3ae4122ad0
author vishal <vishal.bhoj@linaro.org> Tue Apr 10 12:53:01 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 10 12:53:01 2018 -0700
tree 4c835e879e74a1a57779e3a295773e612654ae7d
parent d90f04e92d44c6f1d6ce8ca14089b29d04a3c83e
parent 46787b6dd2dc4a91febe06cc95df25687b79603e

hikey: wifi/bt: fix firmware copy
am: 46787b6dd2

Change-Id: Ib21fad1792a0ea1a33ef2d32368be1b77858465a

hikey/BoardConfig.mk

diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index 26389c1..7f50c5d 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -7,9 +7,9 @@
 TARGET_2ND_CPU_VARIANT := cortex-a53
 
 ifeq ($(TARGET_KERNEL_USE), 3.18)
-BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime
+BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime
 else
-BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime
+BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime
 endif
 
 ifneq ($(TARGET_SENSOR_MEZZANINE),)

hikey/device-hikey.mk

diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk
index 3156453..4063c81 100644
--- a/hikey/device-hikey.mk
+++ b/hikey/device-hikey.mk
@@ -25,12 +25,12 @@
 
 # Copy BT firmware
 PRODUCT_COPY_FILES += \
-	device/linaro/hikey/bt-wifi-firmware-util/TIInit_11.8.32.bts:$(TARGET_OUT_ETC)/firmware/ti-connectivity/TIInit_11.8.32.bts
+	device/linaro/hikey/bt-wifi-firmware-util/TIInit_11.8.32.bts:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-connectivity/TIInit_11.8.32.bts
 
 # Copy wlan firmware
 PRODUCT_COPY_FILES += \
-	device/linaro/hikey/bt-wifi-firmware-util/wl18xx-fw-4.bin:$(TARGET_OUT_ETC)/firmware/ti-connectivity/wl18xx-fw-4.bin \
-	device/linaro/hikey/bt-wifi-firmware-util/wl18xx-conf.bin:$(TARGET_OUT_ETC)/firmware/ti-connectivity/wl18xx-conf.bin
+	device/linaro/hikey/bt-wifi-firmware-util/wl18xx-fw-4.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-connectivity/wl18xx-fw-4.bin \
+	device/linaro/hikey/bt-wifi-firmware-util/wl18xx-conf.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-connectivity/wl18xx-conf.bin
 
 # Build HiKey HDMI audio HAL
 PRODUCT_PACKAGES += audio.primary.hikey