Skip to content

Commit a2fb4d7

Browse files
committed
partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in ROM fonts
STI console is used on parisc and m68k HP machines. This patch partly reverts my previous commit and as such restores the fonts for the m68k machines. Signed-off-by: Helge Deller <[email protected]> Cc: [email protected] # v3.13
1 parent 774868c commit a2fb4d7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/fonts/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if FONT_SUPPORT
99

1010
config FONTS
1111
bool "Select compiled-in fonts"
12-
depends on FRAMEBUFFER_CONSOLE
12+
depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
1313
help
1414
Say Y here if you would like to use fonts other than the default
1515
your frame buffer console usually use.
@@ -22,7 +22,7 @@ config FONTS
2222

2323
config FONT_8x8
2424
bool "VGA 8x8 font" if FONTS
25-
depends on FRAMEBUFFER_CONSOLE
25+
depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
2626
default y if !SPARC && !FONTS
2727
help
2828
This is the "high resolution" font for the VGA frame buffer (the one
@@ -45,7 +45,7 @@ config FONT_8x16
4545

4646
config FONT_6x11
4747
bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
48-
depends on FRAMEBUFFER_CONSOLE
48+
depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
4949
default y if !SPARC && !FONTS && MAC
5050
help
5151
Small console font with Macintosh-style high-half glyphs. Some Mac

0 commit comments

Comments
 (0)