[PATCH][hirsute/linux-oracle] UBUNTU: [config] oracle: Enable CONFIG_SERIAL_AMBA_PL011

[Tim Gardner]

From: Khalid Elmously <khalid.elmously at canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1925421

This option is always needed for arm64 images that will be used in VMs (for serial console to work)
Enabled the option and annotated it.

Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
---

This patch is on hirsute:linux-oracle without having gone through the kteam list and
accruing proper acks. The bug references 'arm64 support', so it likely should have
gone with those patches. However, that was April, this is now. Note that these
config options are enabled for Focal and Impish linux-oracle as part of the initial arm64 enablement.

I noted that the setting in Impish is different, e.g., CONFIG_SERIAL_AMBA_PL011=m. I assume
that is intentional ? (becasue its different then master)

rtg
---
 debian.oracle/config/annotations          | 4 ++++
 debian.oracle/config/config.common.ubuntu | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian.oracle/config/annotations b/debian.oracle/config/annotations
index 396e71ee4179..6f75c945b581 100644
--- a/debian.oracle/config/annotations
+++ b/debian.oracle/config/annotations
@@ -51,3 +51,7 @@ CONFIG_ASHMEM                                     policy<{'amd64': 'm', 'arm64':
 CONFIG_ASHMEM                                     mark<ENFORCED> note<needed for Anbox - LP #1928686>
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT         policy<{'arm64': '-'}>
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT         mark<ENFORCED> note<not selectable for linux-oracle>
+CONFIG_SERIAL_AMBA_PL011                          policy<{'arm64':'y'}>
+CONFIG_SERIAL_AMBA_PL011                          mark<ENFORCED> note<needed for serial support in VMs>
+CONFIG_SERIAL_AMBA_PL011_CONSOLE                  policy<{'arm64':'y'}>
+CONFIG_SERIAL_AMBA_PL011_CONSOLE                  mark<ENFORCED> note<needed for serial support in VMs>
diff --git a/debian.oracle/config/config.common.ubuntu b/debian.oracle/config/config.common.ubuntu
index 7676fca39d1e..7dd6285e98fb 100644
--- a/debian.oracle/config/config.common.ubuntu
+++ b/debian.oracle/config/config.common.ubuntu
@@ -7466,7 +7466,8 @@ CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 # CONFIG_SERIAL_AMBA_PL010 is not set
-# CONFIG_SERIAL_AMBA_PL011 is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
 # CONFIG_SERIAL_BCM63XX is not set
-- 
2.33.0