diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-05-04 14:11:47 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-05-12 10:57:48 -0700 |
| commit | 2954cd75672dac753b516ec8027ccdb7d74b7ca1 (patch) | |
| tree | 19b9923271cdb91c90f25e087e8c5b7adda31b4c | |
| parent | 6c294a5d8a40a918f3970adc42a381988c4ff5b2 (diff) | |
| download | hikey-linaro-n-preview.tar.gz | |
hikey: Enable fiq_debugger supportandroid-wear-n-preview-3android-wear-n-preview-1android-n-preview-3linaro-n-preview
Change-Id: I58f2d285aaf30021436ca981c3f4e3c9b0cc0304
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -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 } |