[SRU][K][PATCH 6/7] UBUNTU: [Config] Set CONFIG_MTD_PSTORE=m on riscv64

[Emil Renner Berthing]

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

This enables the module to log panic/oops to a circular buffer in an MTD
flash partition. All other architectures enables this module, so let's
enable it on riscv64 too.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/annotations                   | 2 +-
 debian.master/config/arm64/config.common.arm64     | 1 -
 debian.master/config/armhf/config.common.armhf     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/riscv64/config.common.riscv64 | 1 -
 7 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index d8351c90c394..5689cddc6654 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -397,7 +397,6 @@ CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_CMDLINE_PARTS=m
 CONFIG_MTD_NAND_CORE=m
-CONFIG_MTD_PSTORE=m
 CONFIG_MTD_RAW_NAND=m
 CONFIG_NET_DSA=m
 # CONFIG_NET_DSA_REALTEK_MDIO is not set
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index cb135b7fa32c..c84bc3f218dc 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -4483,7 +4483,7 @@ CONFIG_RFD_FTL                                  policy<{'amd64': 'm', 'arm64': '
 CONFIG_SSFDC                                    policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_SM_FTL                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_MTD_OOPS                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
-CONFIG_MTD_PSTORE                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'n'}>
+CONFIG_MTD_PSTORE                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_MTD_SWAP                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_MTD_PARTITIONED_MASTER                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': '-'}>
 #
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index dd941e4c5fba..0ff49b1344fc 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -419,7 +419,6 @@ CONFIG_MTD_NAND_OMAP_BCH_BUILD=m
 CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_PHYSMAP_GEMINI=y
 CONFIG_MTD_PHYSMAP_VERSATILE=y
-CONFIG_MTD_PSTORE=m
 CONFIG_MTD_RAW_NAND=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MSCC_FELIX=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 44b18eef92c6..1b4c87609c7f 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -405,7 +405,6 @@ CONFIG_MTD_NAND_OMAP_BCH_BUILD=y
 CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_PHYSMAP_GEMINI=y
 CONFIG_MTD_PHYSMAP_VERSATILE=y
-CONFIG_MTD_PSTORE=m
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MSCC_FELIX=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4e66b04b9a94..9ea00db7da9e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6840,6 +6840,7 @@ CONFIG_MTD_PMC551=m
 # CONFIG_MTD_PMC551_BUGFIX is not set
 # CONFIG_MTD_PMC551_DEBUG is not set
 CONFIG_MTD_POWERNV_FLASH=m
+CONFIG_MTD_PSTORE=m
 CONFIG_MTD_QCOMSMEM_PARTS=m
 CONFIG_MTD_QINFO_PROBE=m
 CONFIG_MTD_RAM=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index fd2af4f363dc..6e16a8b130d0 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -407,7 +407,6 @@ CONFIG_MTD_NAND_CORE=m
 CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PHYSMAP_GEMINI is not set
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
-CONFIG_MTD_PSTORE=m
 CONFIG_MTD_RAW_NAND=m
 CONFIG_NET_DSA=m
 # CONFIG_NET_DSA_MSCC_FELIX is not set
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 47234f373f89..d98a1ff41441 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -399,7 +399,6 @@ CONFIG_MTD_NAND_CORE=m
 CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PHYSMAP_GEMINI is not set
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
-# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAW_NAND is not set
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_REALTEK_MDIO=m
-- 
2.36.1