From patchwork Tue Mar 19 06:58:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1058235 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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 44NkSf10G4z9s47; Tue, 19 Mar 2019 17:59:45 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1h68ip-0006GA-L8; Tue, 19 Mar 2019 06:59:39 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1h68if-0006Av-Ic for kernel-team@lists.ubuntu.com; Tue, 19 Mar 2019 06:59:29 +0000 Received: from mail-pg1-f197.google.com ([209.85.215.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1h68ie-0006fI-TF for kernel-team@lists.ubuntu.com; Tue, 19 Mar 2019 06:59:29 +0000 Received: by mail-pg1-f197.google.com with SMTP id m34so9074077pgb.10 for ; Mon, 18 Mar 2019 23:59:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=y14hoRfIjFWFauqqS0oELdDW8YDiOClTguLzez7DWws=; b=rvW2dVGlzxxA/DQBP+dP4dTyTEavsfaAQ5cs3b0OiToY+wqP+f9a5Z8xoiroJb2Gxl p6cZt6KDQLHGImI5CYPoAZ4lFJz4/4PPSL4FRRdbvHU3l/rndpU761LPbcf3p30O8zZe u8kfV/PzcJ+yZaX0lBvebRbn07UQU32qYkBRfhO0ozDQHvVn1f/dfA3yEvHsjr2XcEh4 PM2KUvNvHC94hut2dS0nCkeJ5ts+T4xWJ31mLVLpCajJYl/svhNus3DhFa1iQgX54C53 J6DjOUB+1hf+QawCRLVvkOIJG/Dk5O04TT+jKehx443iTjdQwMNMQYsGP2PsJeHfCRm1 Lc0w== X-Gm-Message-State: APjAAAV8iKt+OgR8FTu+jxUA6vgrm4g488FJRM1aSTH1PwNMYzYuqcm7 NhZKkHUDfG2MGoG/Ezz53EtdBnlfDfD0qy2Y/JXEozTaA+JXiE60DEK1hU+9st0BAgLtyRGmc21 xttsyX+SAE1pkBemzCXb99AvW9qPE322rZTJOWzLw X-Received: by 2002:a17:902:b20e:: with SMTP id t14mr468324plr.97.1552978767371; Mon, 18 Mar 2019 23:59:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqwRUXxRI6kRuxHat9xx/TQUyaHSLjn2zdVr84DSlgeeAdpyR8k5kJpkr8zlPt18cOpfLZh7WQ== X-Received: by 2002:a17:902:b20e:: with SMTP id t14mr468312plr.97.1552978767141; Mon, 18 Mar 2019 23:59:27 -0700 (PDT) Received: from Leggiero.taipei.internal (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id p86sm23896142pfa.104.2019.03.18.23.59.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 23:59:26 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [X][SRU][PATCH 3/3] UBUNTU: [Config]: enable highdpi Terminus 16x32 font support Date: Tue, 19 Mar 2019 14:58:49 +0800 Message-Id: <20190319065853.4754-9-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190319065853.4754-1-po-hsu.lin@canonical.com> References: <20190319065853.4754-1-po-hsu.lin@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/1819881 Enable the Hi-DPI 16x32 font support. Also enable the compiled-in font support. Signed-off-by: Po-Hsu Lin --- debian.master/config/amd64/config.common.amd64 | 2 +- debian.master/config/annotations | 3 ++- debian.master/config/arm64/config.common.arm64 | 2 +- debian.master/config/config.common.ubuntu | 2 ++ debian.master/config/i386/config.common.i386 | 2 +- debian.master/config/powerpc/config.common.powerpc | 2 +- debian.master/config/ppc64el/config.common.ppc64el | 2 +- debian.master/config/s390x/config.common.s390x | 1 + 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 2bff22c..eece7cb 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -106,7 +106,7 @@ CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIXED_PHY=y CONFIG_FMC=m -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FRAME_WARN=1024 CONFIG_FUSION=y CONFIG_GAMEPORT=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 424980a..d850fe2 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8163,7 +8163,7 @@ CONFIG_CRC32_SARWATE policy<{'amd64': 'n', 'arm64': ' CONFIG_CRC32_BIT policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}> # Menu: Library routines >> Select compiled-in fonts -CONFIG_FONTS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'y', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}> +CONFIG_FONTS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_FONT_8x8 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}> CONFIG_FONT_8x16 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y'}> CONFIG_FONT_6x11 policy<{'armhf': 'n'}> @@ -8175,6 +8175,7 @@ CONFIG_FONT_6x10 policy<{'armhf': 'y'}> CONFIG_FONT_SUN8x16 policy<{'armhf': 'n'}> CONFIG_FONT_SUN12x22 policy<{'armhf': 'n'}> CONFIG_FONT_10x18 policy<{'armhf': 'n'}> +CONFIG_FONT_TER16x32 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> # Menu: Library routines >> XZ decompression support CONFIG_XZ_DEC policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 18f8e06..6fd8c63 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -108,7 +108,7 @@ CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIXED_PHY=y CONFIG_FMC=m -# CONFIG_FONTS is not set +FONFIG_FONTS=y CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_FRAME_WARN=1024 CONFIG_FUSION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f39945d..d6de08a 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2602,6 +2602,7 @@ CONFIG_FMC_CHARDEV=m CONFIG_FMC_FAKEDEV=m CONFIG_FMC_TRIVIAL=m CONFIG_FMC_WRITE_EEPROM=m +CONFIG_FONTS=y # CONFIG_FONT_10x18 is not set CONFIG_FONT_6x10=y # CONFIG_FONT_6x11 is not set @@ -2614,6 +2615,7 @@ CONFIG_FONT_ACORN_8x8=y # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_SUN8x16 is not set CONFIG_FONT_SUPPORT=y +CONFIG_FONT_TER16x32=y CONFIG_FORCEDETH=m CONFIG_FPGA=m CONFIG_FPGA_MGR_ZYNQ_FPGA=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 58b645e..11c0eb9 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -103,7 +103,7 @@ CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIXED_PHY=y CONFIG_FMC=m -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FRAME_WARN=1024 CONFIG_FUSION=y CONFIG_GAMEPORT=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 41c182d..fd95812 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -97,7 +97,7 @@ CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIXED_PHY=y CONFIG_FMC=m -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FRAME_WARN=1024 CONFIG_FUSION=y CONFIG_GAMEPORT=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index c77345c..22714c7 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -110,7 +110,7 @@ CONFIG_FIREWIRE_NOSY=m CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIXED_PHY=y CONFIG_FMC=m -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FORCE_MAX_ZONEORDER=9 CONFIG_FRAME_WARN=2048 CONFIG_FUSION=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 6d64fdf..3529e0a 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -87,6 +87,7 @@ CONFIG_DM_DEBUG=y # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_FIXED_PHY=m # CONFIG_FMC is not set +CONFIG_FONTS=y CONFIG_FORCE_MAX_ZONEORDER=9 CONFIG_FRAME_WARN=1024 # CONFIG_FUSION is not set