diff options
| author | vishal <vishal.bhoj@linaro.org> | 2018-04-10 19:56:30 +0530 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2018-04-10 11:03:48 -0700 |
| commit | 46787b6dd2dc4a91febe06cc95df25687b79603e (patch) | |
| tree | 4c835e879e74a1a57779e3a295773e612654ae7d | |
| parent | 4c6629b314fc9c9d72da4cb1c8a9fcc9f28e7bff (diff) | |
| download | hikey-46787b6dd2dc4a91febe06cc95df25687b79603e.tar.gz | |
hikey: wifi/bt: fix firmware copy
Bug: 77854862, 75288279
Test: Manual
Change-Id: I293b7245635b4ea4f151552906057868f62f583f
Signed-off-by: vishal <vishal.bhoj@linaro.org>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | hikey/BoardConfig.mk | 4 | ||||
| -rw-r--r-- | hikey/device-hikey.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk index 26389c10..7f50c5da 100644 --- a/hikey/BoardConfig.mk +++ b/hikey/BoardConfig.mk @@ -7,9 +7,9 @@ TARGET_CPU_VARIANT := cortex-a53 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),) diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk index 3156453d..4063c811 100644 --- a/hikey/device-hikey.mk +++ b/hikey/device-hikey.mk @@ -25,12 +25,12 @@ PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ # 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 |