diff --git a/target/linux/armsr/image/Makefile b/target/linux/armsr/image/Makefile index c5cf42e336..c823194acc 100644 --- a/target/linux/armsr/image/Makefile +++ b/target/linux/armsr/image/Makefile @@ -19,6 +19,10 @@ endif GRUB_SERIAL:=$(call qstrip,$(CONFIG_TARGET_SERIAL)) GRUB_CONSOLE_CMDLINE += console=$(GRUB_SERIAL),$(CONFIG_GRUB_BAUDRATE)n8$(if $(CONFIG_GRUB_FLOWCONTROL),r,) +ifneq ($(GRUB_SERIAL),ttyAMA0) + GRUB_CONSOLE_CMDLINE += console=ttyAMA0,115200n8 +endif + GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_GRUB_BAUDRATE) --word=8 --parity=no --stop=1 --rtscts=$(if $(CONFIG_GRUB_FLOWCONTROL),on,off) GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS) $(if $(GRUB_SERIAL),serial,) diff --git a/target/linux/armsr/image/grub-efi.cfg b/target/linux/armsr/image/grub-efi.cfg index 7e3b53221b..e56f0662d2 100644 --- a/target/linux/armsr/image/grub-efi.cfg +++ b/target/linux/armsr/image/grub-efi.cfg @@ -11,13 +11,16 @@ if [ ! -e $kernel ]; then fi menuentry "@TITLE@" { - linux $kernel $rompart @BOOTOPTS@ noinitrd + linux $kernel $rompart @CMDLINE@ noinitrd } menuentry "@TITLE@ (failsafe)" { - linux $kernel failsafe=true $rompart @BOOTOPTS@ noinitrd + linux $kernel failsafe=true $rompart @CMDLINE@ noinitrd +} +menuentry "@TITLE@ (tty1)" { + linux $kernel $rompart @BOOTOPTS@ console=tty1 noinitrd $cmdline_ext } menuentry "@TITLE@ (ttyS0)" { - linux $kernel $rompart @CMDLINE@ noinitrd + linux $kernel $rompart @BOOTOPTS@ console=ttyS0,115200n8 noinitrd } menuentry "@TITLE@ (ttyAMA0)" { linux $kernel $rompart @BOOTOPTS@ console=ttyAMA0,115200n8 noinitrd $cmdline_ext