diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-28 07:15:43 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-28 07:15:43 +0000 |
commit | 815e099b190e5e6061aa32589c56c3147595a422 (patch) | |
tree | fb8bf7b5aab1d4b59c32968af0eee56949274c3f | |
parent | 2014563ea8b47daed909546f316297c8b794803f (diff) | |
parent | 6a9f98418a5cb793c82dc3cde9512eb7104a8665 (diff) | |
download | hikey-815e099b190e5e6061aa32589c56c3147595a422.tar.gz |
release-request-fca2b5ac-03eb-4055-a549-b4fc2b292b64-for-git_oc-release-4049993 snap-temp-L04900000068539456android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-release
Change-Id: I9ba300947eda3cfbed385ccfbbf8af4711af642b
-rw-r--r-- | hikey.mk | 2 | ||||
-rw-r--r-- | hikey/BoardConfig.mk | 4 | ||||
-rw-r--r-- | hikey/fstab.hikey-3.18 (renamed from hikey/fstab.hikey-4.1) | 0 |
3 files changed, 3 insertions, 3 deletions
@@ -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 |