Merge drm/drm-next into drm-misc-next

[mirror_ubuntu-hirsute-kernel.git] / lib / fonts / Kconfig

diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
index 37baa79cdd71fa83dee7321a684f60fdc1acded5..c035fde66aebee47c0f7b6dfbc38dbdf10de0eef 100644 (file)
--- a/lib/fonts/Kconfig
+++ b/lib/fonts/Kconfig
@@ -119,6 +119,12 @@ config FONT_TER16x32
          This is the high resolution, large version for use with HiDPI screens.
          If the standard font is unreadable for you, say Y, otherwise say N.
 
          This is the high resolution, large version for use with HiDPI screens.
          If the standard font is unreadable for you, say Y, otherwise say N.
 

+config FONT_6x8
+       bool "OLED 6x8 font" if FONTS
+       depends on FRAMEBUFFER_CONSOLE
+       help
+         This font is useful for small displays (OLED).
+

 config FONT_AUTOSELECT
        def_bool y
        depends on !FONT_8x8
 config FONT_AUTOSELECT
        def_bool y
        depends on !FONT_8x8


@@ -132,6 +138,7 @@ config FONT_AUTOSELECT
        depends on !FONT_SUN12x22
        depends on !FONT_10x18
        depends on !FONT_TER16x32
        depends on !FONT_SUN12x22
        depends on !FONT_10x18
        depends on !FONT_TER16x32

+       depends on !FONT_6x8

        select FONT_8x16
 
 endif # FONT_SUPPORT
        select FONT_8x16
 
 endif # FONT_SUPPORT