summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--device-common.mk4
-rw-r--r--hikey.mk10
-rw-r--r--installer/hikey/fip.binbin1188200 -> 1188200 bytes
-rw-r--r--installer/hikey/l-loader.binbin136192 -> 136192 bytes
-rw-r--r--p2p_supplicant_overlay.conf1
-rw-r--r--wpa_supplicant_overlay.conf3
6 files changed, 17 insertions, 1 deletions
diff --git a/device-common.mk b/device-common.mk
index 170c6d3e..4aefdbff 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -164,7 +164,9 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
- device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf
+ device/linaro/hikey/wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \
+ $(LOCAL_PATH)/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
+ $(LOCAL_PATH)/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
# audio policy configuration
USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/hikey.mk b/hikey.mk
index 779ee872..ca6f2d18 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -1,7 +1,17 @@
ifndef TARGET_KERNEL_USE
TARGET_KERNEL_USE=4.9
endif
+
+ifndef TARGET_COMPRESSED_KERNEL
+TARGET_COMPRESSED_KERNEL=false
+endif
+
+ifeq ($(TARGET_COMPRESSED_KERNEL), false)
TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image-dtb-$(TARGET_KERNEL_USE)
+else
+TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image.gz-dtb-$(TARGET_KERNEL_USE)
+endif
+
TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb-$(TARGET_KERNEL_USE)
ifeq ($(TARGET_KERNEL_USE), 3.18)
diff --git a/installer/hikey/fip.bin b/installer/hikey/fip.bin
index d5674028..1420c805 100644
--- a/installer/hikey/fip.bin
+++ b/installer/hikey/fip.bin
Binary files differ
diff --git a/installer/hikey/l-loader.bin b/installer/hikey/l-loader.bin
index d0954652..31aaadd9 100644
--- a/installer/hikey/l-loader.bin
+++ b/installer/hikey/l-loader.bin
Binary files differ
diff --git a/p2p_supplicant_overlay.conf b/p2p_supplicant_overlay.conf
new file mode 100644
index 00000000..acbace22
--- /dev/null
+++ b/p2p_supplicant_overlay.conf
@@ -0,0 +1 @@
+disable_scan_offload=1
diff --git a/wpa_supplicant_overlay.conf b/wpa_supplicant_overlay.conf
new file mode 100644
index 00000000..e1f530db
--- /dev/null
+++ b/wpa_supplicant_overlay.conf
@@ -0,0 +1,3 @@
+disable_scan_offload=1
+p2p_disabled=1
+tdls_external_control=1