diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg index 9fa2f0e55c..15e7e50555 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg @@ -5,10 +5,12 @@ set oem_id="azure" set linux_append="flatcar.autologin" # Azure only has a serial console. -serial com0 --speed=115200 --word=8 --parity=no -terminal_input serial_com0 -terminal_output serial_com0 +serial --unit=0 --speed=115200 --word=8 --parity=no +terminal_input serial +terminal_output serial -if [ "$grub_platform" = "pc" ]; then - set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200" +if [ "$grub_cpu" = arm64 ]; then + set linux_console="console=tty1 console=ttyAMA0,115200n8 earlycon=pl011,0xeffec000" +else + set linux_console="console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200" fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg index 9fa2f0e55c..15e7e50555 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg @@ -5,10 +5,12 @@ set oem_id="azure" set linux_append="flatcar.autologin" # Azure only has a serial console. -serial com0 --speed=115200 --word=8 --parity=no -terminal_input serial_com0 -terminal_output serial_com0 +serial --unit=0 --speed=115200 --word=8 --parity=no +terminal_input serial +terminal_output serial -if [ "$grub_platform" = "pc" ]; then - set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200" +if [ "$grub_cpu" = arm64 ]; then + set linux_console="console=tty1 console=ttyAMA0,115200n8 earlycon=pl011,0xeffec000" +else + set linux_console="console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200" fi