summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2017-05-11 17:05:01 -0700
committerDmitry Shmidt <dimitrysh@google.com>2017-05-24 11:26:42 -0700
commit6a9f98418a5cb793c82dc3cde9512eb7104a8665 (patch)
treefb8bf7b5aab1d4b59c32968af0eee56949274c3f
parent4ad1622ea5cae3c0d70d5a5728f1457822dc2e42 (diff)
downloadhikey-oreo-dev.tar.gz
hikey: Enable kernel 3.18 instead of 4.1android-vts-8.0_r2android-vts-8.0_r1oreo-dev
Test: Manual Bug: 37983487 Change-Id: Ie12e52a708fb46e22dedeac27968e4d20388f69a Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--hikey.mk2
-rw-r--r--hikey/BoardConfig.mk4
-rw-r--r--hikey/fstab.hikey-3.18 (renamed from hikey/fstab.hikey-4.1)0
3 files changed, 3 insertions, 3 deletions
diff --git a/hikey.mk b/hikey.mk
index 40e1f8b4..3174ba47 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -3,7 +3,7 @@ TARGET_KERNEL_USE=4.9
endif
TARGET_PREBUILT_KERNEL := device/linaro/hikey-kernel/Image-dtb-$(TARGET_KERNEL_USE)
TARGET_PREBUILT_DTB := device/linaro/hikey-kernel/hi6220-hikey.dtb-$(TARGET_KERNEL_USE)
-ifeq ($(TARGET_KERNEL_USE), 4.1)
+ifeq ($(TARGET_KERNEL_USE), 3.18)
TARGET_FSTAB := fstab.hikey-$(TARGET_KERNEL_USE)
else
TARGET_FSTAB := fstab.hikey
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index f4529901..9996f485 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -1,14 +1,14 @@
include device/linaro/hikey/BoardConfigCommon.mk
TARGET_BOARD_PLATFORM := hikey
-ifeq ($(TARGET_KERNEL_USE), 4.1)
+ifeq ($(TARGET_KERNEL_USE), 3.18)
BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime
else
BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime
endif
## printk.devkmsg only has meaning for kernel 4.9 and later
-## it would be ignored by kernel 4.1 and kernel 4.4
+## it would be ignored by kernel 3.18 and kernel 4.4
BOARD_KERNEL_CMDLINE += printk.devkmsg=on
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
diff --git a/hikey/fstab.hikey-4.1 b/hikey/fstab.hikey-3.18
index ceab636d..ceab636d 100644
--- a/hikey/fstab.hikey-4.1
+++ b/hikey/fstab.hikey-3.18