[SRU][Eoan][linux-raspi2][PATCH v2 1/1] UBUNTU: [Config] raspi2: Set NLS_ASCII=y

[Hui Wang]

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

This is used on all Raspberry Pis for mounting the VFAT boot partition,
so we might as well compile it directly into the kernel.

Signed-off-by: Hui Wang <hui.wang at canonical.com>
---
 debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules | 1 -
 debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules | 1 -
 debian.raspi2/config/annotations                     | 3 ++-
 debian.raspi2/config/config.common.ubuntu            | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules b/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
index dbefa8efbb12..1317888c5f95 100644
--- a/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
+++ b/debian.raspi2/abi/5.3.0-1026.28/arm64/raspi2.modules
@@ -2376,7 +2376,6 @@ ni_usb6501
 nilfs2
 nixge
 nlmon
-nls_ascii
 nls_cp1250
 nls_cp1251
 nls_cp1255
diff --git a/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules b/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
index 0e3395bc99f0..4b7955b6d1f5 100644
--- a/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
+++ b/debian.raspi2/abi/5.3.0-1026.28/armhf/raspi2.modules
@@ -2389,7 +2389,6 @@ ni_usb6501
 nilfs2
 nixge
 nlmon
-nls_ascii
 nls_cp1250
 nls_cp1251
 nls_cp1255
diff --git a/debian.raspi2/config/annotations b/debian.raspi2/config/annotations
index bd8a892f78aa..4363b522e317 100644
--- a/debian.raspi2/config/annotations
+++ b/debian.raspi2/config/annotations
@@ -8353,7 +8353,7 @@ CONFIG_NLS_CODEPAGE_874                         policy<{'amd64': 'm', 'arm64': '
 CONFIG_NLS_ISO8859_8                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_CODEPAGE_1250                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_CODEPAGE_1251                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NLS_ASCII                                policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'y', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_ISO8859_1                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_ISO8859_2                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NLS_ISO8859_3                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
@@ -8381,6 +8381,7 @@ CONFIG_NLS_MAC_TURKISH                          policy<{'amd64': 'm', 'arm64': '
 CONFIG_NLS_UTF8                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 #
 CONFIG_NLS                                      note<dependancy of boot essential>
+CONFIG_NLS_ASCII                                note<LP:1881631>
 
 # Menu: File systems >> Network File Systems
 CONFIG_NETWORK_FILESYSTEMS                      policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index 528d72d4962a..76c9a0d69472 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -4857,7 +4857,7 @@ CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NLATTR=y
 CONFIG_NLMON=m
 CONFIG_NLS=y
-CONFIG_NLS_ASCII=m
+CONFIG_NLS_ASCII=y
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_CODEPAGE_437=y
-- 
2.17.1