summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-05-04 14:11:47 -0700
committerDmitry Shmidt <dimitrysh@google.com>2016-05-12 15:29:47 -0700
commit57eabe0db29ebe810887d9c6cd37ea41b99927d7 (patch)
treefd8bbbc52867d5e3a6842bcbe27bd599f94847ff
parent7697047996c3c9fca39c133da470348055f5d59e (diff)
downloadhikey-nougat-dev.tar.gz
hikey: Enable fiq_debugger supportnougat-dev
Change-Id: I58f2d285aaf30021436ca981c3f4e3c9b0cc0304 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--bootloader/EFI/BOOT/grub.cfg20
1 files changed, 17 insertions, 3 deletions
diff --git a/bootloader/EFI/BOOT/grub.cfg b/bootloader/EFI/BOOT/grub.cfg
index f926f7ad..093f1be8 100644
--- a/bootloader/EFI/BOOT/grub.cfg
+++ b/bootloader/EFI/BOOT/grub.cfg
@@ -3,21 +3,35 @@ set timeout=1
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
}