commit 6e2e7bc11872a7971996a8004af6212ab7ca16d1
author Dmitry Shmidt <dimitrysh@google.com> Thu Jul 28 23:02:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 28 23:02:08 2016 +0000
tree e716f54eabc86d3821bdeaa73e72f27bccb231f9
parent fefec37dac1bea33edc6aa22bdf34f94382b1dd9
parent 1ccc21da850221aa18c8391bf7beaf32a364303b

hikey: Fix serial console for kernel 4.1
am: 1ccc21da85

Change-Id: I90fccb2084fa98342bfc5dc964daf903c082b20c

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index c63226a..3dfc149 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -30,7 +30,11 @@
 BOARD_HOSTAPD_DRIVER := NL80211
 CONFIG_DRIVER_NL80211 := y
 
+ifeq ($(TARGET_KERNEL_USE_4_1), true)
+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
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false