commit 996188f5044ac76380b4811e6ae9b9487d2b1b83
author Dmitry Shmidt <dimitrysh@google.com> Sat Jul 29 16:00:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jul 29 16:00:19 2017 +0000
tree d0d9016d937d15593abbf924eed67ae60a3476c8
parent 24161822968bf1523f5611010187330e9eccbd6f
parent 71fd102070e6d3e708c34e666df2dc520eaa26d8

Merge "hikey960: Prepare for multikernel use" am: 946f30a27c am: 675a146f1c
am: 71fd102070

Change-Id: I65534e8123199ba72c6e2d50116eafce110e6b81

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index 986048f..cb3e9f5 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -1,3 +1,9 @@
+ifndef TARGET_KERNEL_USE
+TARGET_KERNEL_USE=4.4
+endif
+TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image.gz-hikey960-$(TARGET_KERNEL_USE)
+TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi3660-hikey960.dtb-$(TARGET_KERNEL_USE)
+
 HIKEY_USE_LEGACY_TI_BLUETOOTH := true
 
 #

hikey960/device-hikey960.mk

diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index 2645e2d..3d2530c 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-PRODUCT_COPY_FILES +=	device/linaro/hikey-kernel/Image.gz-hikey960:kernel \
-			device/linaro/hikey-kernel/hi3660-hikey960.dtb:hi3660-hikey960.dtb
+PRODUCT_COPY_FILES +=	$(TARGET_PREBUILT_KERNEL):kernel \
+			$(TARGET_PREBUILT_DTB):hi3660-hikey960.dtb
 
 PRODUCT_COPY_FILES +=	$(LOCAL_PATH)/fstab.hikey960:root/fstab.hikey960 \
 			device/linaro/hikey/init.common.rc:root/init.hikey960.rc \