diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-05-12 23:40:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-12 23:40:55 +0000 |
| commit | 205f2624df6892cef776e76742d44ab08e913a96 (patch) | |
| tree | fd8bbbc52867d5e3a6842bcbe27bd599f94847ff | |
| parent | b4bf67fa4d8cce2ed76373dc12636709088c6722 (diff) | |
| parent | 57eabe0db29ebe810887d9c6cd37ea41b99927d7 (diff) | |
| download | hikey-205f2624df6892cef776e76742d44ab08e913a96.tar.gz | |
hikey: Enable fiq_debugger support
am: 57eabe0db2
* commit '57eabe0db29ebe810887d9c6cd37ea41b99927d7':
hikey: Enable fiq_debugger support
Change-Id: I97ccc20c8b85c8b8b53d44592fb6e90c1ca55fbe
| -rw-r--r-- | bootloader/EFI/BOOT/grub.cfg | 20 |
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 } |