From patchwork Tue Mar 19 08:34:34 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: 1058272 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 44NmZk6dKwz9s9y; Tue, 19 Mar 2019 19:35:10 +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 1h6ADB-0004zQ-50; Tue, 19 Mar 2019 08:35:05 +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 1h6AD5-0004vv-Rn for kernel-team@lists.ubuntu.com; Tue, 19 Mar 2019 08:34:59 +0000 Received: from mail-pf1-f197.google.com ([209.85.210.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1h6AD5-0005G6-Bs for kernel-team@lists.ubuntu.com; Tue, 19 Mar 2019 08:34:59 +0000 Received: by mail-pf1-f197.google.com with SMTP id j10so22200446pfn.13 for ; Tue, 19 Mar 2019 01:34:59 -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=715jBvCYUI+wU4GQVebZmSuQbOeZ5H7fH0cRFLSy0Qs=; b=lRahTulCpKCkpdGikjK0y83392JAfH2G9L8MR37k/K1nrrGhFMlV8dOGNCGUWd0Fg9 /NeaFID2Z9VclnjRpqwZfp5Zyne44lDeF7dPSvnexA44UDy4EcvfDwR/rbNSqib8NrlX lZUi5OkPvlRhpf7bp7kpnz5qJMcYfCrcTshL/WoHJ2SoiK2a2LJXVUA9lMVJQfIQ+OwS 2YFYH4oFeGZtWWQyosR/gL08a+J+r1Qd7qLr5u/T2fo/N7RgRJW7Pa6siB9hq+EoTepS 3NMDfAHO3xYrvwzrAqfTrwP9pO3zksRJDpLGldcfPdeUjEieTZBqZxT7jayDZ6CPSpWM 0I6A== X-Gm-Message-State: APjAAAX0e4TmFBQ9AvCjzX9cxz6SL9w0s2suG9p6nsRti6T29GfGfunh XM8jpKSPgNeypFYGDraX4bYp8Hh4oJsz4fL9W/v09YZZ6jVleDEUNb4DauQBvNkPmqj+FnwI0WF EPtMsblWG/3mUghPWcrFeRxL94QiLdAt1uDQYpOhT X-Received: by 2002:a63:1f61:: with SMTP id q33mr723728pgm.325.1552984497872; Tue, 19 Mar 2019 01:34:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqxruLJwmWghAZSDZDOcXKEeqvkjsQ7o35So1nMDN030Pdkkxl/hettm40pVn8jPuW/vdL94Mg== X-Received: by 2002:a63:1f61:: with SMTP id q33mr723716pgm.325.1552984497667; Tue, 19 Mar 2019 01:34:57 -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 1sm16963242pfi.99.2019.03.19.01.34.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 01:34:56 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [X][SRU][PATCHv2 1/3] lib/fonts/Kconfig: keep non-Sparc fonts listed together Date: Tue, 19 Mar 2019 16:34:34 +0800 Message-Id: <20190319083440.9477-7-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190319083440.9477-1-po-hsu.lin@canonical.com> References: <20190319083440.9477-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" From: Randy Dunlap BugLink: https://bugs.launchpad.net/bugs/1819881 Keep fonts together and indented (in menu) as much as possible. This moves the Sparc font choices to the end of the menu since they have different dependencies. Link: http://lkml.kernel.org/r/de6d8977-c6d6-a82d-c953-f2a2fefdb8a5@infradead.org Signed-off-by: Randy Dunlap Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit 7bcae82621df080a35cb5e708ef333a821effd96) Signed-off-by: Po-Hsu Lin --- lib/fonts/Kconfig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig index e77dfe0..8fa0791 100644 --- a/lib/fonts/Kconfig +++ b/lib/fonts/Kconfig @@ -87,6 +87,14 @@ config FONT_6x10 embedded devices with a 320x240 screen, to get a reasonable number of characters (53x24) that are still at a readable size. +config FONT_10x18 + bool "console 10x18 font (not supported by all drivers)" if FONTS + depends on FRAMEBUFFER_CONSOLE + help + This is a high resolution console font for machines with very + big letters. It fits between the sun 12x22 and the normal 8x16 font. + If other fonts are too big or too small for you, say Y, otherwise say N. + config FONT_SUN8x16 bool "Sparc console 8x16 font" depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC) @@ -101,14 +109,6 @@ config FONT_SUN12x22 big letters (like the letters used in the SPARC PROM). If the standard font is unreadable for you, say Y, otherwise say N. -config FONT_10x18 - bool "console 10x18 font (not supported by all drivers)" if FONTS - depends on FRAMEBUFFER_CONSOLE - help - This is a high resolution console font for machines with very - big letters. It fits between the sun 12x22 and the normal 8x16 font. - If other fonts are too big or too small for you, say Y, otherwise say N. - config FONT_AUTOSELECT def_bool y depends on !FONT_8x8