Module Name: src
Committed By: jakllsch
Date: Sun Feb 16 18:04:58 UTC 2025
Modified Files:
src/sys/arch/macppc/conf: GENERIC GENERIC_601 MAMBO POWERMAC
POWERMAC_G5 POWERMAC_G5_11_2
Log Message:
Add and enable WSDISPLAY_SCROLLSUPPORT in non-INSTALLish macppc kernels
Also, fix the whitespace of this line in the GENERIC_601 kernel where it
was already enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.381 -r1.382 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/macppc/conf/MAMBO
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/macppc/conf/POWERMAC
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/macppc/conf/POWERMAC_G5
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/macppc/conf/POWERMAC_G5_11_2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.381 src/sys/arch/macppc/conf/GENERIC:1.382
--- src/sys/arch/macppc/conf/GENERIC:1.381 Sun Feb 16 17:55:57 2025
+++ src/sys/arch/macppc/conf/GENERIC Sun Feb 16 18:04:57 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.381 2025/02/16 17:55:57 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.382 2025/02/16 18:04:57 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.381 $"
+#ident "GENERIC-$Revision: 1.382 $"
maxusers 32
@@ -145,6 +145,7 @@ options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
+options WSDISPLAY_SCROLLSUPPORT
options FONT_GALLANT12x22
options FONT_QVSS8x15 # a smaller font for lower resolutions
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.33 src/sys/arch/macppc/conf/GENERIC_601:1.34
--- src/sys/arch/macppc/conf/GENERIC_601:1.33 Sun Feb 16 17:55:57 2025
+++ src/sys/arch/macppc/conf/GENERIC_601 Sun Feb 16 18:04:57 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.33 2025/02/16 17:55:57 jakllsch Exp $
+# $NetBSD: GENERIC_601,v 1.34 2025/02/16 18:04:57 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.33 $"
+ident "GENERIC-$Revision: 1.34 $"
maxusers 32
@@ -163,7 +163,7 @@ options WS_DEFAULT_FG=WSCOL_BLACK
options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
options WS_KERNEL_FG=WSCOL_GREEN
options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
-options WSDISPLAY_SCROLLSUPPORT
+options WSDISPLAY_SCROLLSUPPORT
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
Index: src/sys/arch/macppc/conf/MAMBO
diff -u src/sys/arch/macppc/conf/MAMBO:1.37 src/sys/arch/macppc/conf/MAMBO:1.38
--- src/sys/arch/macppc/conf/MAMBO:1.37 Sun Feb 16 17:55:57 2025
+++ src/sys/arch/macppc/conf/MAMBO Sun Feb 16 18:04:57 2025
@@ -6,7 +6,7 @@ include "arch/macppc/conf/std.macppc.g5
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.37 $"
+#ident "GENERIC-$Revision: 1.38 $"
maxusers 32
@@ -87,6 +87,7 @@ options WSEMUL_VT100 # VT100 / VT220
options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
+options WSDISPLAY_SCROLLSUPPORT
options FONT_GALLANT12x22
# Optional Mac keyboard tweaks
Index: src/sys/arch/macppc/conf/POWERMAC
diff -u src/sys/arch/macppc/conf/POWERMAC:1.72 src/sys/arch/macppc/conf/POWERMAC:1.73
--- src/sys/arch/macppc/conf/POWERMAC:1.72 Sun Feb 16 17:55:58 2025
+++ src/sys/arch/macppc/conf/POWERMAC Sun Feb 16 18:04:57 2025
@@ -1,4 +1,4 @@
-# $NetBSD: POWERMAC,v 1.72 2025/02/16 17:55:58 jakllsch Exp $
+# $NetBSD: POWERMAC,v 1.73 2025/02/16 18:04:57 jakllsch Exp $
#
# POWERMAC config file
#
@@ -55,6 +55,7 @@ options PCIVERBOSE # verbose PCI device
options WSEMUL_VT100 # VT100 / VT220 emulation
options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
+options WSDISPLAY_SCROLLSUPPORT
options FONT_GALLANT12x22
# Kernel root file system and dump configuration.
Index: src/sys/arch/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.59 src/sys/arch/macppc/conf/POWERMAC_G5:1.60
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.59 Sun Feb 16 17:55:58 2025
+++ src/sys/arch/macppc/conf/POWERMAC_G5 Sun Feb 16 18:04:57 2025
@@ -111,6 +111,7 @@ options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
options WS_KERNEL_FG=WSCOL_GREEN
options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
+options WSDISPLAY_SCROLLSUPPORT
options FONT_GALLANT12x22
# Kernel root file system and dump configuration.
Index: src/sys/arch/macppc/conf/POWERMAC_G5_11_2
diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.26 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.27
--- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.26 Sun Feb 16 17:55:58 2025
+++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2 Sun Feb 16 18:04:57 2025
@@ -89,6 +89,7 @@ options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
options WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
+options WSDISPLAY_SCROLLSUPPORT
options FONT_GALLANT12x22
# Kernel root file system and dump configuration.
