hikey: Move TARGET_KERNEL_USE_4_1 check to hikey.mk
device.mk is loaded before BoadConfig.mk, therefore
TARGET_KERNEL_USE_4_1 should be checked earlier.
Change-Id: I1a273b07042fcd519e6d1b2c7a55ed4540341200
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
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
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)
