From patchwork Tue Mar 19 06:58:46 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: 1058234 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 44NkSd52Ncz9s9y; 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 1h68io-0006Fb-TF; Tue, 19 Mar 2019 06:59:38 +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 1h68iZ-00066f-PS for kernel-team@lists.ubuntu.com; Tue, 19 Mar 2019 06:59:23 +0000 Received: from mail-pg1-f200.google.com ([209.85.215.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1h68iZ-0006ev-6k for kernel-team@lists.ubuntu.com; Tue, 19 Mar 2019 06:59:23 +0000 Received: by mail-pg1-f200.google.com with SMTP id 18so2619455pgx.11 for ; Mon, 18 Mar 2019 23:59:23 -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=B6R3KZaricDtiIqyPoW73eplO+bA+/v7SBrDfbrYC8g=; b=R81ftGqQPEAhBDgz7yFd5TKcTs9geTI7tCpZY9BXDom2nYQgw1VObLGHCACenHbtqa CXRJKrdHpLjEI6OMSzDgP/Bxkpna2Y8ZU7StY/8GBXPZfRW8mdaJAr3HiU4wbG5l8TzP CZ84h94qUFEc/1aF8/IIeKc5fFJdM9HVEfG2+Pi+zn9LWC3N1neGphj7iU6NseNoP+Nc 2zGeqietC5KuUu5q8BMXP6UPmnFOuirJT/nap/cT90uBoF2zdR28ZlIH5ytrzb22dd2J fYOEDSUvzQsRTHyyg/c6d8n30Y44kDqf129e76L5Gj0bSPIGevYgA38W/qBF92MhxUUl xVGQ== X-Gm-Message-State: APjAAAW4Xu5zdMdDXaDJNOYey9vgph5lupGmCiv/cm9fxvp9XLCC7LQb RGRPelQKgIJJR+AF7O8cbP4e+TZXp51nTvEfPh2/fWoCGDw1aNNxQ1/kFHLi8HuQc04E9VZZ087 HeZ+6jfCHTZOiPYFwr33lGOKzigCGK4f9Kgo6RrDm X-Received: by 2002:a62:1249:: with SMTP id a70mr440946pfj.160.1552978761620; Mon, 18 Mar 2019 23:59:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwlM6yY+TscwzB2wt7l7UvR28Ss0UR4VN/MfgoheprhwVlKiNGmULx3bLC+itAI/SiyA6sIIw== X-Received: by 2002:a62:1249:: with SMTP id a70mr440938pfj.160.1552978761413; Mon, 18 Mar 2019 23:59:21 -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.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 23:59:20 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [T][SRU][PATCH 5/5] UBUNTU: [Config]: enable highdpi Terminus 16x32 font support Date: Tue, 19 Mar 2019 14:58:46 +0800 Message-Id: <20190319065853.4754-6-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 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 4204ad9..7ed87f4 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -46,7 +46,7 @@ CONFIG_FB_UDL=m CONFIG_FB_VOODOO1=m # CONFIG_FMAN_P1023 is not set CONFIG_FMAN_P3040_P4080_P5020=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FRAME_WARN=1024 CONFIG_FSL_FMAN=y CONFIG_FUNCTION_TRACER=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 469b39f..f90fb0e 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1699,7 +1699,7 @@ CONFIG_CRC_T10DIF y note CONFIG_CRC32 y note CONFIG_CRC32_SELFTEST n flag CONFIG_XZ_DEC y note -CONFIG_FONTS p policy<(arch armel armhf &/ value y) | value n> +CONFIG_FONTS p policy<(arch amd64 armhf i386 powerpc ppc64el &/ value y) | value n> CONFIG_FONT_8x8 y CONFIG_FONT_8x16 y CONFIG_FONT_6x11 n @@ -1710,6 +1710,7 @@ CONFIG_FONT_MINI_4x6 n CONFIG_FONT_SUN8x16 n CONFIG_FONT_SUN12x22 n CONFIG_FONT_10x18 n +CONFIG_FONT_TER16x32 y # Menu: Networking options CONFIG_PACKET y note diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 82c6c90..11326f1 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -38,7 +38,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m CONFIG_FB_VOODOO1=m # CONFIG_FMAN_P1023 is not set CONFIG_FMAN_P3040_P4080_P5020=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_FRAME_WARN=1024 CONFIG_FSL_FMAN=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 3dc161c..ffc07c60 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2123,6 +2123,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 is not set # CONFIG_FONT_6x11 is not set @@ -2135,6 +2136,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_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index e42c57c..5198088 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -45,7 +45,7 @@ CONFIG_FB_UDL=m CONFIG_FB_VOODOO1=m # CONFIG_FMAN_P1023 is not set CONFIG_FMAN_P3040_P4080_P5020=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FRAME_WARN=1024 CONFIG_FSL_FMAN=y CONFIG_FUNCTION_TRACER=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 67d7e73..496f36f 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -39,7 +39,7 @@ CONFIG_FB_MACMODES=y CONFIG_FB_RADEON=y CONFIG_FB_SVGALIB=m CONFIG_FB_VOODOO1=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FRAME_WARN=1024 CONFIG_FUNCTION_TRACER=y # CONFIG_GENERIC_CSUM is not set diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index f0e7fa5..e452328 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -48,7 +48,7 @@ CONFIG_FB_UDL=m CONFIG_FB_VOODOO1=m # CONFIG_FMAN_P1023 is not set CONFIG_FMAN_P3040_P4080_P5020=y -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FORCE_MAX_ZONEORDER=9 CONFIG_FRAME_WARN=2048 CONFIG_FSL_FMAN=y