commit d5b9330d28e105eff9899feb4bd2fc3859497752
author Dmitry Shmidt <dimitrysh@google.com> Wed Mar 23 23:52:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 23 23:52:49 2016 +0000
tree 2ab6ee2f61ae5245695d94923d0d7df02bdb891b
parent 18dc51c5de1652672408d05572b5b0ca06955e90
parent 3ec96c47fbdc9d8867ddada718dd099bd5e3dba1

hikey: Move TARGET_KERNEL_USE_4_1 check to hikey.mk
am: 3ec96c4

* commit '3ec96c47fbdc9d8867ddada718dd099bd5e3dba1':
  hikey: Move TARGET_KERNEL_USE_4_1 check to hikey.mk

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4309696..9902d4a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -59,9 +59,3 @@
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := squashfs
 endif
 endif
-
-ifeq ($(TARGET_KERNEL_USE_4_1), true)
-TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image-4.1
-TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb-4.1
-TARGET_FSTAB := fstab.hikey-4.1
-endif

hikey.mk

diff --git a/hikey.mk b/hikey.mk
index b48e531..c5923e0 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -1,3 +1,9 @@
+ifeq ($(TARGET_KERNEL_USE_4_1), true)
+TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image-4.1
+TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb-4.1
+TARGET_FSTAB := fstab.hikey-4.1
+endif
+
 #
 # Inherit the full_base and device configurations
 $(call inherit-product, device/linaro/hikey/device.mk)