Commit 998e6d51 authored by Zach Smith's avatar Zach Smith Committed by Linus Torvalds

[PATCH] fbcon: Add rl (Roman Large) font

I converted the "rl" console font from the kbd utility to be a built-in font
for the framebuffer console, and I was wondering if you would be OK with
including it.  I've generated a font_rl.c file and related minor
modifications.  I find it's the most visually appealing of the kbd fonts which
is why I use it and selected it for conversion.  I believe the font is GPL'd.
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e07dea98
...@@ -205,5 +205,12 @@ config FONT_10x18 ...@@ -205,5 +205,12 @@ config FONT_10x18
big letters. It fits between the sun 12x22 and the normal 8x16 font. 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. If other fonts are too big or too small for you, say Y, otherwise say N.
config FONT_RL
bool "console Roman Large 8x16 font" if FONTS
depends on FRAMEBUFFER_CONSOLE
help
This is the visually-appealing "RL" console font that is
included with the kbd package.
endmenu endmenu
...@@ -15,6 +15,7 @@ font-objs-$(CONFIG_FONT_10x18) += font_10x18.o ...@@ -15,6 +15,7 @@ font-objs-$(CONFIG_FONT_10x18) += font_10x18.o
font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
font-objs-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o font-objs-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o
font-objs-$(CONFIG_FONT_RL) += font_rl.o
font-objs += $(font-objs-y) font-objs += $(font-objs-y)
......
This diff is collapsed.
...@@ -64,6 +64,10 @@ static const struct font_desc *fonts[] = { ...@@ -64,6 +64,10 @@ static const struct font_desc *fonts[] = {
#undef NO_FONTS #undef NO_FONTS
&font_mini_4x6, &font_mini_4x6,
#endif #endif
#ifdef CONFIG_FONT_RL
#undef NO_FONTS
&font_rl,
#endif
}; };
#define num_fonts (sizeof(fonts)/sizeof(*fonts)) #define num_fonts (sizeof(fonts)/sizeof(*fonts))
......
...@@ -31,6 +31,7 @@ struct font_desc { ...@@ -31,6 +31,7 @@ struct font_desc {
#define SUN12x22_IDX 7 #define SUN12x22_IDX 7
#define ACORN8x8_IDX 8 #define ACORN8x8_IDX 8
#define MINI4x6_IDX 9 #define MINI4x6_IDX 9
#define RL_IDX 10
extern const struct font_desc font_vga_8x8, extern const struct font_desc font_vga_8x8,
font_vga_8x16, font_vga_8x16,
...@@ -41,6 +42,7 @@ extern const struct font_desc font_vga_8x8, ...@@ -41,6 +42,7 @@ extern const struct font_desc font_vga_8x8,
font_sun_8x16, font_sun_8x16,
font_sun_12x22, font_sun_12x22,
font_acorn_8x8, font_acorn_8x8,
font_rl,
font_mini_4x6; font_mini_4x6;
/* Find a font with a specific name */ /* Find a font with a specific name */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment