diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-03-23 16:29:35 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-03-23 16:49:56 -0700 |
| commit | 3ec96c47fbdc9d8867ddada718dd099bd5e3dba1 (patch) | |
| tree | 6826ff9f5f99e87c06428e9fcee04c7c44cc08e4 | |
| parent | 16c8b0ad0ff1eb319ea171c702b573e5faa2e7c4 (diff) | |
| download | hikey-3ec96c47fbdc9d8867ddada718dd099bd5e3dba1.tar.gz | |
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>
| -rw-r--r-- | BoardConfig.mk | 6 | ||||
| -rw-r--r-- | hikey.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 4309696e..9902d4a8 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -59,9 +59,3 @@ ifeq ($(TARGET_SYSTEMIMAGES_USE_SQUASHFS), true) 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 @@ -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) |