From patchwork Fri Mar 7 10:14:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 3789101 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B70139F35F for ; Fri, 7 Mar 2014 10:14:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96D4820279 for ; Fri, 7 Mar 2014 10:14:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B0B020274 for ; Fri, 7 Mar 2014 10:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751645AbaCGKOz (ORCPT ); Fri, 7 Mar 2014 05:14:55 -0500 Received: from mail-bk0-f48.google.com ([209.85.214.48]:47942 "EHLO mail-bk0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751027AbaCGKOx (ORCPT ); Fri, 7 Mar 2014 05:14:53 -0500 Received: by mail-bk0-f48.google.com with SMTP id mx12so839995bkb.7 for ; Fri, 07 Mar 2014 02:14:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Zt8ZRXYQmvA43XYhN0G6mi/Jksn6OA56Bzdu3gkYi4k=; b=A50YwJyo2HrmKc3VFKJK5kZZhEpbssixx+Y2LGh6GinDk1UUy3jBQ71aMiiatoBHMg SA5QcX1C4AvxBDTZ5F+Om4Fd7oy7fr44nwrz13aELAaZj+PhGRoSb6zCbtViG32hQoGo TA0n6SLw+LEh8LW7BYWdtmKfs+XYueszAuXzISVp5dvydt0sszxpfSBfrr7cmD7QBgth 6yb6Ht/myg7SbBMYSjr0pufi5IZHxG00x/5rlWGAXk8VMtnTBPf3cbd/3HDuEHkTOhNm /oWse+lb7iObLu/veeTjF1iNBaFXnxd3vdXP/U7of1LJXezKiP0JhqSidEgHPucx6wd1 QhAQ== X-Received: by 10.204.56.132 with SMTP id y4mr70355bkg.168.1394187291884; Fri, 07 Mar 2014 02:14:51 -0800 (PST) Received: from david-tp.localdomain (stgt-5f718583.pool.mediaWays.net. [95.113.133.131]) by mx.google.com with ESMTPSA id dn8sm1736614bkc.13.2014.03.07.02.14.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Mar 2014 02:14:51 -0800 (PST) From: David Herrmann To: linux-kernel@vger.kernel.org Cc: Geert Uytterhoeven , linux-fbdev@vger.kernel.org, Tomi Valkeinen , Andrew Morton , Greg Kroah-Hartman , David Herrmann Subject: [PATCH] lib: remove FBCON dependency for fonts Date: Fri, 7 Mar 2014 11:14:31 +0100 Message-Id: <1394187271-5857-1-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 1.9.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fonts don't depend on CONFIG_FRAMEBUFFER_CONSOLE at all. Remove that. Besides, CONFIG_FONT_SUPPORT is 'select'ed anyway, so the dependencies aren't checked by most higher-level options. It's a relict of the times when fonts where exclusive to the VT layer and fbcon. Signed-off-by: David Herrmann --- lib/fonts/Kconfig | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig index 4dc1b99..0ca66a3 100644 --- a/lib/fonts/Kconfig +++ b/lib/fonts/Kconfig @@ -9,7 +9,6 @@ if FONT_SUPPORT config FONTS bool "Select compiled-in fonts" - depends on FRAMEBUFFER_CONSOLE help Say Y here if you would like to use fonts other than the default your frame buffer console usually use. @@ -22,7 +21,6 @@ config FONTS config FONT_8x8 bool "VGA 8x8 font" if FONTS - depends on FRAMEBUFFER_CONSOLE default y if !SPARC && !FONTS help This is the "high resolution" font for the VGA frame buffer (the one @@ -45,7 +43,6 @@ config FONT_8x16 config FONT_6x11 bool "Mac console 6x11 font (not supported by all drivers)" if FONTS - depends on FRAMEBUFFER_CONSOLE default y if !SPARC && !FONTS && MAC help Small console font with Macintosh-style high-half glyphs. Some Mac @@ -53,7 +50,6 @@ config FONT_6x11 config FONT_7x14 bool "console 7x14 font (not supported by all drivers)" if FONTS - depends on FRAMEBUFFER_CONSOLE help Console font with characters just a bit smaller than the default. If the standard 8x16 font is a little too big for you, say Y. @@ -61,7 +57,6 @@ config FONT_7x14 config FONT_PEARL_8x8 bool "Pearl (old m68k) console 8x8 font" if FONTS - depends on FRAMEBUFFER_CONSOLE default y if !SPARC && !FONTS && AMIGA help Small console font with PC-style control-character and high-half @@ -69,7 +64,6 @@ config FONT_PEARL_8x8 config FONT_ACORN_8x8 bool "Acorn console 8x8 font" if FONTS - depends on FRAMEBUFFER_CONSOLE default y if !SPARC && !FONTS && ARM && ARCH_ACORN help Small console font with PC-style control characters and high-half @@ -81,13 +75,13 @@ config FONT_MINI_4x6 config FONT_SUN8x16 bool "Sparc console 8x16 font" - depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC) + depends on !SPARC && FONTS || SPARC help This is the high resolution console font for Sun machines. Say Y. config FONT_SUN12x22 bool "Sparc console 12x22 font (not supported by all drivers)" - depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC) + depends on !SPARC && FONTS || SPARC help This is the high resolution console font for Sun machines with very big letters (like the letters used in the SPARC PROM). If the @@ -95,7 +89,6 @@ config FONT_SUN12x22 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.