diff --git a/sys/arch/shark/conf/GENERIC b/sys/arch/shark/conf/GENERIC index 1a32c59e4948..ecb215646e5e 100644 --- a/sys/arch/shark/conf/GENERIC +++ b/sys/arch/shark/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.70 2007/07/31 19:35:37 jmmv Exp $ +# $NetBSD: GENERIC,v 1.71 2007/08/05 13:37:31 jmmv Exp $ # # Generic Shark configuration. # @@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.70 $" +#ident "GENERIC-$Revision: 1.71 $" # estimated number of users maxusers 32 @@ -208,8 +208,6 @@ options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes #options WSDISPLAY_SCROLLSUPPORT # enable VGA raster mode capable of displaying multilingual text on console #options VGA_RASTERCONSOLE -# the font to be used by vga(4); the hardware built-in font is broken -options FONT_VT220L8x16 config netbsd root on ? type ? diff --git a/sys/arch/shark/conf/INSTALL b/sys/arch/shark/conf/INSTALL index 2218e8d9a0da..c8acce253f93 100644 --- a/sys/arch/shark/conf/INSTALL +++ b/sys/arch/shark/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.32 2007/07/31 19:51:58 jmmv Exp $ +# $NetBSD: INSTALL,v 1.33 2007/08/05 13:37:31 jmmv Exp $ # # Shark installation kernel # @@ -178,8 +178,6 @@ options WSEMUL_VT100 # VT100 / VT220 emulation #options WSDISPLAY_SCROLLSUPPORT # enable VGA raster mode capable of displaying multilingual text on console #options VGA_RASTERCONSOLE -# the font to be used by vga(4); the hardware built-in font is broken -options FONT_VT220L8x16 config netbsd root on ? type ffs # root on miniroot diff --git a/sys/arch/shark/conf/std.shark b/sys/arch/shark/conf/std.shark index a4c3073b696b..73f55f0877a7 100644 --- a/sys/arch/shark/conf/std.shark +++ b/sys/arch/shark/conf/std.shark @@ -1,4 +1,4 @@ -# $NetBSD: std.shark,v 1.5 2005/12/11 12:19:02 christos Exp $ +# $NetBSD: std.shark,v 1.6 2007/08/05 13:37:31 jmmv Exp $ # # standard NetBSD/shark options @@ -16,3 +16,8 @@ options ARM32 # XXX options OFW + +# The font to be used by vga(4); the hardware built-in font is broken. +# This also requires wsfont to be useful. Does not disturb if it is +# not enabled. +options FONT_VT220L8x16