On Sun, 14 Mar 1999, Anton Blanchard wrote:
> Can someone that understands the config system have a look at
> drivers/video/Config.in? I have problems with CONFIG_FONT_SUN8x16 and
> CONFIG_FBCON_FONTS which seems to be a result of it being defined twice.
I won't make any grand claims like pretending to understand the config
system, but it looks like we use CONFIG_FBCON_FONTS at two entirely
independant places -- once in an 'if [ sparc ]' construct, and once not.
I've attached a patch which I think should fix things, but get somebody
else to check it before committing it, because its 6 am and I don't
remember eating yesterday, so this may be a 'must finish patch and crawl
to microwave' patch ;)
-- Peter
"The worst thing about some men is that when they are not drunk they are
sober."
-- Yeats
--- drivers/video/Config.old Sun Mar 14 05:53:15 1999
+++ drivers/video/Config.in Sun Mar 14 05:54:39 1999
@@ -281,45 +281,32 @@
bool 'Support only 8 pixels wide fonts' CONFIG_FBCON_FONTWIDTH8_ONLY
if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then
bool 'Sparc console 8x16 font 1' CONFIG_FONT_SUN8x16
+ fi
+ bool 'Select other fonts' CONFIG_FBCON_FONTS
+ if [ "$CONFIG_FBCON_FONTS" = "y" ]; then
+ bool ' VGA 8x8 font' CONFIG_FONT_8x8
+ bool ' VGA 8x16 font' CONFIG_FONT_8x16
if [ "$CONFIG_FBCON_FONTWIDTH8_ONLY" = "n" ]; then
- bool 'Sparc console 12x22 font (not supported by all drivers)'
CONFIG_FONT_SUN12x22
- fi
- bool 'Select other fonts' CONFIG_FBCON_FONTS
- if [ "$CONFIG_FBCON_FONTS" = "y" ]; then
- bool ' VGA 8x8 font' CONFIG_FONT_8x8
- bool ' VGA 8x16 font' CONFIG_FONT_8x16
- if [ "$CONFIG_FBCON_FONTWIDTH8_ONLY" = "n" ]; then
- bool ' Mac console 6x11 font (not supported by all drivers)'
CONFIG_FONT_6x11
+ if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then # do we need this?
+ bool ' Sparc console 12x22 font (not supported by all drivers)'
+CONFIG_FONT_SUN12x22
fi
- bool ' Pearl (old m68k) console 8x8 font' CONFIG_FONT_PEARL_8x8
- bool ' Acorn console 8x8 font' CONFIG_FONT_ACORN_8x8
+ bool ' Mac console 6x11 font (not supported by all drivers)' CONFIG_FONT_6x11
fi
+ bool ' Pearl (old m68k) console 8x8 font' CONFIG_FONT_PEARL_8x8
+ bool ' Acorn console 8x8 font' CONFIG_FONT_ACORN_8x8
else
- bool 'Select compiled-in fonts' CONFIG_FBCON_FONTS
- if [ "$CONFIG_FBCON_FONTS" = "y" ]; then
- bool ' VGA 8x8 font' CONFIG_FONT_8x8
- bool ' VGA 8x16 font' CONFIG_FONT_8x16
- bool ' Sparc console 8x16 font 2' CONFIG_FONT_SUN8x16
+ define_bool CONFIG_FONT_8x8 y
+ define_bool CONFIG_FONT_8x16 y
+ if [ "$CONFIG_MAC" = "y" ]; then
if [ "$CONFIG_FBCON_FONTWIDTH8_ONLY" = "n" ]; then
- bool ' Sparc console 12x22 font (not supported by all drivers)'
CONFIG_FONT_SUN12x22
- bool ' Mac console 6x11 font (not supported by all drivers)'
CONFIG_FONT_6x11
- fi
- bool ' Pearl (old m68k) console 8x8 font' CONFIG_FONT_PEARL_8x8
- bool ' Acorn console 8x8 font' CONFIG_FONT_ACORN_8x8
- else
- define_bool CONFIG_FONT_8x8 y
- define_bool CONFIG_FONT_8x16 y
- if [ "$CONFIG_MAC" = "y" ]; then
- if [ "$CONFIG_FBCON_FONTWIDTH8_ONLY" = "n" ]; then
- define_bool CONFIG_FONT_6x11 y
- fi
- fi
- if [ "$CONFIG_AMIGA" = "y" ]; then
- define_bool CONFIG_FONT_PEARL_8x8 y
- fi
- if [ "$CONFIG_ARM" = "y" ]; then
- define_bool CONFIG_FONT_ACORN_8x8 y
+ define_bool CONFIG_FONT_6x11 y
fi
+ fi
+ if [ "$CONFIG_AMIGA" = "y" ]; then
+ define_bool CONFIG_FONT_PEARL_8x8 y
+ fi
+ if [ "$CONFIG_ARM" = "y" ]; then
+ define_bool CONFIG_FONT_ACORN_8x8 y
fi
fi
fi
