[SRU][G/linux-oracle][PATCH 18/18] UBUNTU: [config] oracle: enable CONFIG_SERIAL_AMBA_PL011=y

[Khalid Elmously]

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

Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
---
 debian.oracle/config/annotations          | 6 ++++--
 debian.oracle/config/config.common.ubuntu | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian.oracle/config/annotations b/debian.oracle/config/annotations
index 1021d9730b38..2d65682261c1 100644
--- a/debian.oracle/config/annotations
+++ b/debian.oracle/config/annotations
@@ -37,7 +37,9 @@ CONFIG_SND_SOC_INTEL_CNL                          mark<ENFORCED> note<not select
 CONFIG_SYSTEM_TRUSTED_KEYS                        policy<{'amd64': '"debian/canonical-certs.pem"'}>
 CONFIG_X86_UV                                     policy<{'amd64': 'n'}>
 CONFIG_X86_UV                                     mark<ENFORCED> note<not needed for cloud kernels>
-CONFIG_ATARI_PARTITION                             policy<{'amd64': 'n', 'arm64': 'n'}>
-CONFIG_ATARI_PARTITION                             mark<ENFORCED> note<LP:1908264>
+CONFIG_ATARI_PARTITION                            policy<{'amd64': 'n', 'arm64': 'n'}>
+CONFIG_ATARI_PARTITION                            mark<ENFORCED> note<LP:1908264>
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT         policy<{'arm64': '-'}>
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT         mark<ENFORCED>
+CONFIG_SERIAL_AMBA_PL011                          policy<{'amd64': '-', 'arm64': 'y'}>
+CONFIG_SERIAL_AMBA_PL011                          mark<ENFORCED> note<Needed for serial support in QEMU on arm64>
diff --git a/debian.oracle/config/config.common.ubuntu b/debian.oracle/config/config.common.ubuntu
index 3024af392657..118d131bea68 100644
--- a/debian.oracle/config/config.common.ubuntu
+++ b/debian.oracle/config/config.common.ubuntu
@@ -7333,7 +7333,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_CONEXANT_DIGICOLOR is not set
-- 
2.17.1