hikey/hikey960: Remove use of FIQ0 console
Since the FIQ_debugger is now deprecated in android-4.19,
and its utility on hikey/hikey960 has always been minimal
given there isn't a real FIQ (just an maskable IRQ), lets
just remove the use of the FIQ0 console.
We still have to keep it for 4.4/4.9/4.14 hikey kernels,
as removing it breaks console input. We will need to
land kernel changes and update userspace.
But for hikey960 removing it is ok.
Change-Id: I85ac12660ab0b5d38d64486ffef4ae0cebbe5e8f
Signed-off-by: John Stultz <john.stultz@linaro.org>
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