From d30359a8064839001f1dd0eb07b1dfb413e75dc6 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 9 Feb 2022 10:52:14 +0100 Subject: [PATCH] coreos-base/oem-ec2-compat: specify correct console on arm64 The default arm64 console (console=ttyAMA0) that is set by grub is wrong for EC2 arm64, so fix the value and enable earlycon. --- .../coreos-base/oem-ec2-compat/files/grub-ec2.cfg | 3 +++ ...-ec2-compat-0.1.2.ebuild => oem-ec2-compat-0.1.2-r1.ebuild} | 0 2 files changed, 3 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.1.2.ebuild => oem-ec2-compat-0.1.2-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg index 640de525bd..2ee4b3f33f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg @@ -12,3 +12,6 @@ if [ "$grub_platform" = pc ]; then terminal_input serial_com0 terminal_output serial_com0 fi +if [ "$grub_cpu" = arm64 ]; then + set linux_console="console=tty1 console=ttyS0,115200n8 earlycon" +fi diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r1.ebuild