UBUNTU: [Config] CONFIG_NVRAM=y for ppc64el

BugLink: https://bugs.launchpad.net/bugs/1837726
Until 5.2 nvram support was built into the kernel for ppc64el.
Now it is a module and not included in the installer udebs, which
causes installation to fail. Change it back to =y for ppc64el to
fix this.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9c2195931b93a2e8c9bd64d2eb242b5fbe611d33..4acc2a4b208030beaf9bf90a574a10f640920894 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -420,6 +420,7 @@ CONFIG_NTB=m
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_NVMEM=y
+CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 # CONFIG_OF is not set
 CONFIG_OMFS_FS=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 947d84e90abd2a9193383ce980dc0a2c7f218a27..3d0580116574c443d3966fd2282925720ab5c1fa 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -659,7 +659,7 @@ CONFIG_IBM_BSR                                  policy<{'ppc64el': 'm'}>
 CONFIG_POWERNV_OP_PANEL                         policy<{'ppc64el': 'm'}>
 CONFIG_NPCM7XX_KCS_IPMI_BMC                     policy<{'armhf': 'm'}>
 CONFIG_IPMB_DEVICE_INTERFACE                    policy<{'arm64': 'm', 'armhf': 'm'}>
-CONFIG_NVRAM                                    policy<{'amd64': 'm', 'i386': 'm', 'ppc64el': 'm'}>
+CONFIG_NVRAM                                    policy<{'amd64': 'm', 'i386': 'm', 'ppc64el': 'y'}>
 CONFIG_DTLK                                     policy<{'i386': 'm'}>
 CONFIG_APPLICOM                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_SONYPI                                   policy<{'i386': 'm'}>
@@ -702,6 +702,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_NVRAM                                    mark<ENFORCED> note<LP#1837726>
 CONFIG_SCLP_OFB                                 mark<ENFORCED> note<LP:1787898>
 
 # Menu: Device Drivers >> Character devices >> Enable TTY

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c6141a8d61755e5f53d85989c3a34e4fbd111e00..49592681d0392b15f3c48c293303be185a09635c 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6638,7 +6638,6 @@ CONFIG_NVME_TARGET_TCP=m
 CONFIG_NVME_TCP=m
 CONFIG_NVM_PBLK=m
 # CONFIG_NVM_PBLK_DEBUG is not set
-CONFIG_NVRAM=m
 CONFIG_NV_TCO=m
 CONFIG_NXP_TJA11XX_PHY=m
 CONFIG_N_HDLC=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d5ffafa7a3d81d784addcca31125099e7416c6ea..9c434a6c20752a133fb87ae691b9754a435547c1 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -411,6 +411,7 @@ CONFIG_NR_CPUS_RANGE_END=8
 CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NVMEM=y
+CONFIG_NVRAM=m
 CONFIG_N_GSM=m
 # CONFIG_OF is not set
 CONFIG_OMFS_FS=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 7810eff57b5eae9e8241dc26a0d36a1a972c93cb..ddbb56abb58536df5c254820f5a1e8c7fe5847ee 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -418,6 +418,7 @@ CONFIG_NTB=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NVMEM=y
+CONFIG_NVRAM=y
 CONFIG_N_GSM=m
 CONFIG_OF=y
 CONFIG_OMFS_FS=m