UBUNTU: [Config] CONFIG_SCLP_OFB=y for s390x

BugLink: https://bugs.launchpad.net/bugs/1787898
This is required for booting an IBM Secure Service Container
Appliance in an s390 LPAR.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 5d8144bfba419f4207c781fe2ebfa4863851bd99..2b8d43f08de2aa43dc630eb3ceecc436eb41b3e6 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -778,7 +778,7 @@ CONFIG_SCLP_VT220_CONSOLE                       policy<{'s390x': 'y'}>
 CONFIG_SCLP_ASYNC                               policy<{'s390x': 'm'}>
 CONFIG_SCLP_ASYNC_ID                            policy<{'s390x': '"000000000"'}>
 CONFIG_HMC_DRV                                  policy<{'s390x': 'm'}>
-CONFIG_SCLP_OFB                                 policy<{'s390x': 'n'}>
+CONFIG_SCLP_OFB                                 policy<{'s390x': 'y'}>
 CONFIG_S390_TAPE                                policy<{'s390x': 'm'}>
 CONFIG_S390_TAPE_34XX                           policy<{'s390x': 'm'}>
 CONFIG_S390_TAPE_3590                           policy<{'s390x': 'm'}>
@@ -794,6 +794,7 @@ CONFIG_XILLYBUS_OF                              policy<{'arm64': 'm', 'armhf': '
 #
 CONFIG_DEVKMEM                                  mark<ENFORCED> note</dev/kmem is a large attack vector>
 CONFIG_HVC_UDBG                                 mark<ENFORCED> note<LP#1680888>
+CONFIG_SCLP_OFB                                 mark<ENFORCED> note<LP:1787898>
 
 # Menu: Device Drivers >> Character devices >> Enable TTY
 CONFIG_TTY                                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 2a0a4c1969dedb1a9fdb4d8877e4873e33c3a84c..9f83432949564a4895b6f382c29fe3ce6881bafd 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7667,7 +7667,7 @@ CONFIG_SCIF_BUS=m
 CONFIG_SCLP_ASYNC=m
 CONFIG_SCLP_ASYNC_ID="000000000"
 CONFIG_SCLP_CONSOLE=y
-# CONFIG_SCLP_OFB is not set
+CONFIG_SCLP_OFB=y
 CONFIG_SCLP_TTY=y
 CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_VT220_TTY=y