From patchwork Wed Jun 3 08:36:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1302857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49cMhx33wvz9sSd; Wed, 3 Jun 2020 18:37:05 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jgOtR-0006H4-N3; Wed, 03 Jun 2020 08:37:01 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jgOtP-0006GX-ST for kernel-team@lists.ubuntu.com; Wed, 03 Jun 2020 08:36:59 +0000 Received: from [114.253.255.123] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jgOtP-0004po-1T for kernel-team@lists.ubuntu.com; Wed, 03 Jun 2020 08:36:59 +0000 From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][Eoan][linux-raspi2][PATCH v2 1/1] UBUNTU: [Config] raspi2: Set NLS_ASCII=y Date: Wed, 3 Jun 2020 16:36:38 +0800 Message-Id: <20200603083638.5258-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200603083638.5258-1-hui.wang@canonical.com> References: <20200603083638.5258-1-hui.wang@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 Acked-by: Kleber Sacilotto de Souza --- 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 +CONFIG_NLS_ASCII note # 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