Commit a03a84be authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Jocelyn Falempe

lib/fonts: Fix visiblity of SUN12x22 and TER16x32 if DRM_PANIC

When CONFIG_FONTS ("Select compiled-in fonts") is not enabled, the user
should not be asked about any fonts.  However, when CONFIG_DRM_PANIC is
enabled, the user is still asked about the Sparc console 12x22 and
Terminus 16x32 fonts.

Fix this by moving the "|| DRM_PANIC" to where it belongs.
Split the dependency in two rules to improve readability.

Fixes: b94605a3 ("lib/fonts: Allow to select fonts for drm_panic")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Signed-off-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ac474c6755800e61e18bd5af407c6acb449c5149.1718305355.git.geert+renesas@glider.be
parent 94ff11d3
...@@ -105,7 +105,8 @@ config FONT_SUN8x16 ...@@ -105,7 +105,8 @@ config FONT_SUN8x16
config FONT_SUN12x22 config FONT_SUN12x22
bool "Sparc console 12x22 font (not supported by all drivers)" bool "Sparc console 12x22 font (not supported by all drivers)"
depends on (FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)) || DRM_PANIC depends on FRAMEBUFFER_CONSOLE || DRM_PANIC
depends on !SPARC && FONTS
help help
This is the high resolution console font for Sun machines with very This is the high resolution console font for Sun machines with very
big letters (like the letters used in the SPARC PROM). If the big letters (like the letters used in the SPARC PROM). If the
...@@ -113,7 +114,8 @@ config FONT_SUN12x22 ...@@ -113,7 +114,8 @@ config FONT_SUN12x22
config FONT_TER16x32 config FONT_TER16x32
bool "Terminus 16x32 font (not supported by all drivers)" bool "Terminus 16x32 font (not supported by all drivers)"
depends on (FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)) || DRM_PANIC depends on FRAMEBUFFER_CONSOLE || DRM_PANIC
depends on !SPARC && FONTS || SPARC
help help
Terminus Font is a clean, fixed width bitmap font, designed Terminus Font is a clean, fixed width bitmap font, designed
for long (8 and more hours per day) work with computers. for long (8 and more hours per day) work with computers.
......
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