diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-03-23 12:31:46 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-03-23 12:31:46 -0700 |
| commit | 60380208315e8f40c72c097377688dfb9dc54325 (patch) | |
| tree | 40f9ba22c9fa02a9033ad69f273b480f614e3de0 | |
| parent | d426d5c0e82fa202e9a5fad6613def9d24342e31 (diff) | |
| download | hikey-60380208315e8f40c72c097377688dfb9dc54325.tar.gz | |
hikey: Allow different kernel use by TARGET_KERNEL_USE_4_1
Change-Id: I6d6cdc0d0ab86f12660cf8f8107d729a78a537ef
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | BoardConfig.mk | 6 | ||||
| -rw-r--r-- | device.mk | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 4332fd01..d318cd95 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -56,3 +56,9 @@ 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 @@ -20,14 +20,16 @@ $(call inherit-product-if-exists, frameworks/native/build/tablet-10in-xhdpi-2048 ifeq ($(TARGET_PREBUILT_KERNEL),) LOCAL_KERNEL := device/linaro/hikey-kernel/Image LOCAL_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb +LOCAL_FSTAB := fstab.hikey else LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) LOCAL_DTB := $(TARGET_PREBUILT_DTB) +LOCAL_FSTAB := $(TARGET_FSTAB) endif PRODUCT_COPY_FILES += $(LOCAL_KERNEL):kernel \ $(LOCAL_DTB):hi6220-hikey.dtb \ - $(LOCAL_PATH)/fstab.hikey:root/fstab.hikey \ + $(LOCAL_PATH)/$(LOCAL_FSTAB):root/fstab.hikey \ $(LOCAL_PATH)/init.hikey.rc:root/init.hikey.rc \ $(LOCAL_PATH)/init.hikey.usb.rc:root/init.hikey.usb.rc \ $(LOCAL_PATH)/ueventd.hikey.rc:root/ueventd.hikey.rc \ |