[SRU][K][PATCH 03/16] UBUNTU: [Config] Disable CONFIG_FONT_6x8 on riscv64

[Emil Renner Berthing]

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

This option was not annotated in the linux-riscv tree, so let's align it
with the other architectures.

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 -
 debian.master/config/s390x/config.common.s390x     | 1 -
 8 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 4e71ee8464e0..eb956dc5d413 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -171,7 +171,6 @@ CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_MEMMAP=y
-# CONFIG_FONT_6x8 is not set
 CONFIG_FORTIFY_SOURCE=y
 CONFIG_FPGA_BRIDGE=m
 CONFIG_FPGA_DFL=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f2d8dacaa3bd..ecb9f10fde80 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -12001,7 +12001,7 @@ CONFIG_FONT_10x18                               policy<{'amd64': 'n', 'arm64': '
 CONFIG_FONT_SUN8x16                             policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
 CONFIG_FONT_SUN12x22                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
 CONFIG_FONT_TER16x32                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
-CONFIG_FONT_6x8                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'y', 's390x': 'n'}>
+CONFIG_FONT_6x8                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
 
 # Menu: Library routines >> XZ decompression support
 CONFIG_XZ_DEC                                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 4649e94119bd..905badc4a32e 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -182,7 +182,6 @@ CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_MEMMAP=y
-# CONFIG_FONT_6x8 is not set
 CONFIG_FORTIFY_SOURCE=y
 CONFIG_FPGA_BRIDGE=m
 CONFIG_FPGA_DFL=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 09da64415cb7..5a8d7276a948 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -174,7 +174,6 @@ CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_MEMMAP=y
-# CONFIG_FONT_6x8 is not set
 CONFIG_FORTIFY_SOURCE=y
 CONFIG_FPGA_BRIDGE=m
 CONFIG_FPGA_DFL=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c2855fa0d319..f7c7f5ec1e0b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3836,6 +3836,7 @@ CONFIG_FONTS=y
 # CONFIG_FONT_10x18 is not set
 CONFIG_FONT_6x10=y
 # CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_6x8 is not set
 # CONFIG_FONT_7x14 is not set
 CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 2e30608710e0..821ffc6cadd8 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -173,7 +173,6 @@ CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_MEMMAP=y
-# CONFIG_FONT_6x8 is not set
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FORTIFY_SOURCE=y
 CONFIG_FPGA_BRIDGE=m
diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64
index 15424da6ab39..065e3a4bfc77 100644
--- a/debian.master/config/riscv64/config.common.riscv64
+++ b/debian.master/config/riscv64/config.common.riscv64
@@ -172,7 +172,6 @@ CONFIG_FEALNX=m
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_NOSY=m
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_FONT_6x8=y
 # CONFIG_FORTIFY_SOURCE is not set
 CONFIG_FPGA_BRIDGE=m
 CONFIG_FPGA_DFL=m
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index cb977fc5bc42..fa902e5304bb 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -156,7 +156,6 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FIREWIRE is not set
 # CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_FONT_6x8 is not set
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FPGA_BRIDGE is not set
 # CONFIG_FPGA_DFL is not set
-- 
2.36.1