History

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.

Helge Deller committed 12 years ago

Commit a2fb4d71 parent 774868c1 file · +3 −3Browse files

Unified · Split

lib/fonts/Kconfig+3−3
@@ -9,7 +9,7 @@ if FONT_SUPPORT · 8 unmodified lines
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 · 6 unmodified lines
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 · 16 unmodified lines
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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t