[N/U][PATCH 6/6] UBUNTU: [Config] Disable BINFMT_FLAT for riscv64

[Emil Renner Berthing]

Disable support for uClinux FLAT binaries. This is mainly used on very
small systems without an MMU that Ubuntu userspace already does not
support.

Signed-off-by: Emil Renner Berthing <emil.renner.berthing at canonical.com>
---
 debian.master/config/annotations | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 9727b2d1e426..0119793fb687 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -2182,11 +2182,11 @@ CONFIG_BINARY_PRINTF                            policy<{'amd64': 'y', 'arm64': '
 CONFIG_BINDGEN_VERSION_TEXT                     policy<{'amd64': '"bindgen 0.65.1"'}>
 CONFIG_BINFMT_ELF                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_BINFMT_ELF_FDPIC                         policy<{'armhf': 'y'}>
-CONFIG_BINFMT_FLAT                              policy<{'armhf': 'y', 'riscv64': 'y'}>
+CONFIG_BINFMT_FLAT                              policy<{'armhf': 'y', 'riscv64': 'n'}>
 CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK          policy<{'armhf': 'y'}>
-CONFIG_BINFMT_FLAT_OLD                          policy<{'armhf': 'y', 'riscv64': 'y'}>
+CONFIG_BINFMT_FLAT_OLD                          policy<{'armhf': 'y'}>
 CONFIG_BINFMT_MISC                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
-CONFIG_BINFMT_ZFLAT                             policy<{'armhf': 'y', 'riscv64': 'y'}>
+CONFIG_BINFMT_ZFLAT                             policy<{'armhf': 'y'}>
 CONFIG_BITREVERSE                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_BLKDEV_UBLK_LEGACY_OPCODES               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n'}>
 CONFIG_BLK_CGROUP                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
-- 
2.43.0