commit 4f6e63ae9965159ae67ce3d1a44a2350ac246644
author Dmitry Shmidt <dimitrysh@google.com> Thu May 12 23:40:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 12 23:40:57 2016 +0000
tree 19b9923271cdb91c90f25e087e8c5b7adda31b4c
parent b50d89721bd8fe08d2b768aab7d69414ef15a4ca
parent 2954cd75672dac753b516ec8027ccdb7d74b7ca1

hikey: Enable fiq_debugger support
am: 2954cd7567

* commit '2954cd75672dac753b516ec8027ccdb7d74b7ca1':
  hikey: Enable fiq_debugger support

Change-Id: I0dd0d4282c34e4a403fdf2664183e5e8f5d3ceca

bootloader/EFI/BOOT/grub.cfg

diff --git a/bootloader/EFI/BOOT/grub.cfg b/bootloader/EFI/BOOT/grub.cfg
index f926f7a..093f1be 100644
--- a/bootloader/EFI/BOOT/grub.cfg
+++ b/bootloader/EFI/BOOT/grub.cfg
@@ -3,21 +3,35 @@
 menuentry 'AOSP' {
     search.fs_label boot root
     set root=($root)
-    linux /Image console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime androidboot.selinux=permissive
+    linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime androidboot.selinux=permissive
+    initrd /ramdisk.img
+    devicetree /hi6220-hikey.dtb
+}
+menuentry 'AOSP-DEBUG' {
+    search.fs_label boot root
+    set root=($root)
+    linux /Image earlycon=pl011,0xf7113000 no_console_suspend=1 console=ttyFIQ0 androidboot.console=ttyFIQ0 sysrq_always_enabled androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime androidboot.selinux=permissive
+    initrd /ramdisk.img
+    devicetree /hi6220-hikey.dtb
+}
+menuentry 'AOSP-CONSOLE' {
+    search.fs_label boot root
+    set root=($root)
+    linux /Image console=ttyAMA3,115200 androidboot.console=ttyAMA3 fiq_debugger.disable=Y androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime androidboot.selinux=permissive
     initrd /ramdisk.img
     devicetree /hi6220-hikey.dtb
 }
 menuentry 'AOSP@720P' {
     search.fs_label boot root
     set root=($root)
-    linux /Image console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:1280x720@60 androidboot.selinux=permissive
+    linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:1280x720@60 androidboot.selinux=permissive
     initrd /ramdisk.img
     devicetree /hi6220-hikey.dtb
 }
 menuentry 'AOSP@SVGA' {
     search.fs_label boot root
     set root=($root)
-    linux /Image console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:800x600@60 androidboot.selinux=permissive
+    linux /Image console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime video=HDMI-A-1:800x600@60 androidboot.selinux=permissive
     initrd /ramdisk.img
     devicetree /hi6220-hikey.dtb
 }