summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-05-28 07:15:43 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-05-28 07:15:43 +0000
commit815e099b190e5e6061aa32589c56c3147595a422 (patch)
treefb8bf7b5aab1d4b59c32968af0eee56949274c3f
parent2014563ea8b47daed909546f316297c8b794803f (diff)
parent6a9f98418a5cb793c82dc3cde9512eb7104a8665 (diff)
downloadhikey-oreo-r2-release.tar.gz
Change-Id: I9ba300947eda3cfbed385ccfbbf8af4711af642b
-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