[SRU][K][PATCH 1/7] UBUNTU: [Config] Enable CONFIG_EFIVAR_FS on riscv64

[Emil Renner Berthing]

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

All other EFI supporting architectures builds this in, so let's do the
same on riscv64.

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/riscv64/config.common.riscv64 | 1 -
 6 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 7871708f6b2b..6787b3f7d612 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -118,7 +118,6 @@ CONFIG_EEPROM_EE1004=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
-CONFIG_EFIVAR_FS=y
 CONFIG_EFS_FS=m
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ETHOC=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 0eacc7a4bfe6..1ccaf033dda8 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11022,7 +11022,7 @@ CONFIG_PROC_CHILDREN                            policy<{'amd64': 'y', 'arm64': '
 CONFIG_SYSFS                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_HUGETLBFS                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_CONFIGFS_FS                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
-CONFIG_EFIVAR_FS                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': 'm'}>
+CONFIG_EFIVAR_FS                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': 'y'}>
 #
 CONFIG_CONFIGFS_FS                              flag<REVIEW>
 CONFIG_EFIVAR_FS                                note<needed for variable EFI update>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index c1a8058b4819..f4efcf61fea9 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -129,7 +129,6 @@ CONFIG_EEPROM_EE1004=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
-CONFIG_EFIVAR_FS=y
 CONFIG_EFS_FS=m
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ETHOC=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 9d2ad7fbd5d2..cbd6e7625ae7 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -122,7 +122,6 @@ CONFIG_EEPROM_EE1004=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
-CONFIG_EFIVAR_FS=y
 CONFIG_EFS_FS=m
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ETHOC=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 2c90ea5f2280..fcb2b70b2499 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3523,6 +3523,7 @@ CONFIG_EEH=y
 CONFIG_EEPROM_93XX46=m
 CONFIG_EEPROM_AT25=m
 CONFIG_EFI=y
+CONFIG_EFIVAR_FS=y
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 CONFIG_EFI_CAPSULE_LOADER=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 78711552b0ba..d32d91c71f03 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -119,7 +119,6 @@ CONFIG_EEPROM_EE1004=m
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
-CONFIG_EFIVAR_FS=m
 CONFIG_EFS_FS=m
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ETHOC=m
-- 
2.36.1