hikey/hikey960: Remove use of FIQ0 console am: 719a094191
am: 08e39f9671
Change-Id: Ibdd50a205968f980fbfc88a0dfc5990a6f477638
diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk
index 2f5a983..90bbc6c 100644
--- a/hikey/BoardConfig.mk
+++ b/hikey/BoardConfig.mk
@@ -9,8 +9,13 @@
ifeq ($(TARGET_KERNEL_USE), 3.18)
BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime
else
+ifeq ($(TARGET_KERNEL_USE), 4.19)
+BOARD_KERNEL_CMDLINE := console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime
+else
+# FIQ debugger is deprecated and we'll remoeve this once kernel support in prebuilts are yanked
BOARD_KERNEL_CMDLINE := console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime
endif
+endif
ifneq ($(TARGET_ANDROID_VERITY),)
# Enable dtb fstab for treble, with verity and system-as-root
diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk
index 49fd4e0..9a1e437 100644
--- a/hikey960/BoardConfig.mk
+++ b/hikey960/BoardConfig.mk
@@ -8,7 +8,7 @@
TARGET_NO_DTIMAGE := false
-BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey960 console=ttyFIQ0 androidboot.console=ttyFIQ0
+BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey960
BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/firmware loglevel=15 efi=noruntime
ifeq ($(TARGET_BUILTIN_EDID), true)