commit a989af2048292c5af48b366239945491d1e8e160
author Dmitry Shmidt <dimitrysh@google.com> Thu Jul 28 23:02:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 28 23:02:06 2016 +0000
tree 3e3f369fca5e8f61795a4efee979930d2803ccaf
parent 17a32c0af541a2fc19bbfda4a0cfe059a94aa035
parent 510fa77059150f0f1469696d3372b7f985cf3740

hikey: Fix serial console for kernel 4.1
am: 510fa77059

Change-Id: Idf599b38bdf44f54dd18d50336c534d4fffff189

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