Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Update all kernel configs mentioning WSEMUL_* but n...



details:   https://anonhg.NetBSD.org/src/rev/d1ba34f45b85
branches:  trunk
changeset: 781087:d1ba34f45b85
user:      abs <abs%NetBSD.org@localhost>
date:      Fri Aug 17 20:11:37 2012 +0000

description:
Update all kernel configs mentioning WSEMUL_* but not already including
WSDISPLAY_COMPAT_USL using the following rules:
- If WSEMUL_ is commented out, add commented out out WSDISPLAY_COMPAT_USL
- If INSTALL or obviously memory constrained, add WSDISPLAY_DEFAULTSCREENS=1
  and commented out WSDISPLAY_COMPAT_USL
- Otherwise add WSDISPLAY_COMPAT_USL

Some of the INSTALL configs for larger memory machines are probably suitable
for adding WSDISPLAY_COMPAT_USL.

Now wsconscfg(8) should be able to switch VTs when expected.

Implemented after no objection from tech-kern to the following:

On 5 June 2012 09:47, David Brownlee <abs%absd.org@localhost> wrote:
> wsconscfg(8) requires WSDISPLAY_COMPAT_USL in order to switch virtual
> terminals.
>
> Except when in an exceptionally memory or space constrained
> environment (INSTALL being the obvious case), is there any reason why
> all GENERIC and GENERIC-like kernels which have wscons enabled
> shouldn't also have WSDISPLAY_COMPAT_USL?

diffstat:

 sys/arch/acorn26/conf/FOURMEG        |  3 ++-
 sys/arch/acorn26/conf/GENERIC        |  3 ++-
 sys/arch/acorn26/conf/INSTALL        |  4 +++-
 sys/arch/acorn32/conf/EB7500ATX      |  5 +++--
 sys/arch/acorn32/conf/INSTALL        |  5 +++--
 sys/arch/acorn32/conf/LOWMEM_WSCONS  |  3 ++-
 sys/arch/acorn32/conf/NC             |  4 +++-
 sys/arch/algor/conf/P4032            |  5 +++--
 sys/arch/algor/conf/P5064            |  5 +++--
 sys/arch/algor/conf/P6032            |  5 +++--
 sys/arch/alpha/conf/GENERIC          |  5 +++--
 sys/arch/alpha/conf/INSTALL          |  3 ++-
 sys/arch/amiga/conf/GENERIC          |  5 +++--
 sys/arch/amiga/conf/GENERIC.in       |  5 +++--
 sys/arch/amiga/conf/INSTALL          |  5 +++--
 sys/arch/amiga/conf/WSCONS           |  3 ++-
 sys/arch/amigappc/conf/GENERIC       |  5 +++--
 sys/arch/amigappc/conf/NULL          |  5 +++--
 sys/arch/arc/conf/ARCTIC             |  3 ++-
 sys/arch/arc/conf/GENERIC            |  5 +++--
 sys/arch/arc/conf/M403               |  3 ++-
 sys/arch/arc/conf/MIMORI             |  3 ++-
 sys/arch/arc/conf/PCCONS             |  3 ++-
 sys/arch/arc/conf/PICA               |  3 ++-
 sys/arch/arc/conf/RPC44              |  5 +++--
 sys/arch/atari/conf/MILAN-ISAIDE     |  3 ++-
 sys/arch/atari/conf/MILAN-PCIIDE     |  3 ++-
 sys/arch/dreamcast/conf/GENERIC      |  3 ++-
 sys/arch/emips/conf/GENERIC          |  5 +++--
 sys/arch/emips/conf/INSTALL          |  4 +++-
 sys/arch/evbarm/conf/INTEGRATOR      |  3 ++-
 sys/arch/evbarm/conf/LUBBOCK         |  1 +
 sys/arch/evbarm/conf/MINI2440        |  3 ++-
 sys/arch/evbarm/conf/SMDK2410        |  3 ++-
 sys/arch/evbarm/conf/TWINTAIL        |  3 ++-
 sys/arch/evbmips/conf/GDIUM          |  5 +++--
 sys/arch/evbmips/conf/LOONGSON       |  5 +++--
 sys/arch/evbppc/conf/EV64260         |  3 ++-
 sys/arch/evbppc/conf/MPC8536DS       |  5 +++--
 sys/arch/evbppc/conf/MPC8548CDS      |  5 +++--
 sys/arch/evbppc/conf/OPENBLOCKS200   |  3 ++-
 sys/arch/evbppc/conf/P2020DS         |  5 +++--
 sys/arch/evbppc/conf/P2020RDB        |  5 +++--
 sys/arch/evbppc/conf/RB800           |  5 +++--
 sys/arch/evbppc/conf/TWRP1025        |  5 +++--
 sys/arch/evbppc/conf/WALNUT          |  3 ++-
 sys/arch/ews4800mips/conf/GENERIC    |  5 +++--
 sys/arch/hp300/conf/GENERIC          |  5 +++--
 sys/arch/hp300/conf/INSTALL          |  4 +++-
 sys/arch/hpcsh/conf/HPW650PA         |  3 ++-
 sys/arch/i386/conf/GENERIC_PS2TINY   |  9 +++++----
 sys/arch/ibmnws/conf/GENERIC         |  3 ++-
 sys/arch/iyonix/conf/GENERIC         |  5 +++--
 sys/arch/luna68k/conf/GENERIC        |  5 +++--
 sys/arch/luna68k/conf/INSTALL        |  4 +++-
 sys/arch/mac68k/conf/GENERIC         |  5 +++--
 sys/arch/mac68k/conf/INSTALL         |  4 +++-
 sys/arch/macppc/conf/GENERIC         |  5 +++--
 sys/arch/macppc/conf/INSTALL         |  4 +++-
 sys/arch/macppc/conf/MAMBO           |  3 ++-
 sys/arch/macppc/conf/POWERMAC        |  3 ++-
 sys/arch/macppc/conf/POWERMAC_G5     |  1 +
 sys/arch/mvmeppc/conf/GENERIC        |  5 +++--
 sys/arch/newsmips/conf/DEJIKO        |  3 ++-
 sys/arch/newsmips/conf/GENERIC       |  5 +++--
 sys/arch/newsmips/conf/INSTALL       |  4 +++-
 sys/arch/newsmips/conf/WAPIKO        |  3 ++-
 sys/arch/ofppc/conf/GENERIC          |  5 +++--
 sys/arch/pmax/conf/GENERIC           |  5 +++--
 sys/arch/pmax/conf/GENERIC64         |  5 +++--
 sys/arch/pmax/conf/INSTALL           |  4 +++-
 sys/arch/pmax/conf/INSTALL64         |  4 +++-
 sys/arch/prep/conf/INSTALL           |  3 ++-
 sys/arch/prep/conf/INSTALL_SMALL     |  4 +++-
 sys/arch/rs6000/conf/GENERIC         |  5 +++--
 sys/arch/sgimips/conf/GENERIC32_IP12 |  5 +++--
 sys/arch/sgimips/conf/GENERIC32_IP2x |  5 +++--
 sys/arch/sgimips/conf/GENERIC32_IP3x |  5 +++--
 sys/arch/sparc/conf/INSTALL          |  4 +++-
 sys/arch/sparc/conf/MRCOFFEE         |  5 +++--
 sys/arch/vax/conf/INSTALL            |  5 +++--
 sys/arch/vax/conf/VAX780             |  3 ++-
 sys/arch/zaurus/conf/INSTALL         |  3 ++-
 83 files changed, 218 insertions(+), 123 deletions(-)

diffs (truncated from 1775 to 300 lines):

diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/acorn26/conf/FOURMEG
--- a/sys/arch/acorn26/conf/FOURMEG     Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/acorn26/conf/FOURMEG     Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.39 2011/11/22 21:24:51 tls Exp $
+# $NetBSD: FOURMEG,v 1.40 2012/08/17 20:11:37 abs Exp $
 
 # FOURMEG arm26 configuration -- something small
 
@@ -113,6 +113,7 @@
 #options       WSEMUL_NODUMB
 #options       WSEMUL_SUN
 #options       WSEMUL_VT100
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 options        FONT_VT220L8x8          # 8x8 font for console
 options        RASOPS_SMALL
 
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/acorn26/conf/GENERIC
--- a/sys/arch/acorn26/conf/GENERIC     Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/acorn26/conf/GENERIC     Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.67 2012/03/10 21:51:48 joerg Exp $
+# $NetBSD: GENERIC,v 1.68 2012/08/17 20:11:37 abs Exp $
 #
 # GENERIC machine description file
 # 
@@ -149,6 +149,7 @@
 #options       WSEMUL_NODUMB
 #options       WSEMUL_SUN
 options        WSEMUL_VT100
+options        WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 options        FONT_VT220L8x8          # 8x8 font for console
 
 config         netbsd  root on ? type ?
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/acorn26/conf/INSTALL
--- a/sys/arch/acorn26/conf/INSTALL     Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/acorn26/conf/INSTALL     Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.34 2011/12/18 05:49:22 dholland Exp $
+# $NetBSD: INSTALL,v 1.35 2012/08/17 20:11:37 abs Exp $
 
 # INSTALL configuration, used to generate installation media
 
@@ -118,6 +118,8 @@
 options        WSEMUL_NODUMB
 options        WSEMUL_SUN
 #options       WSEMUL_VT100
+options        WSDISPLAY_DEFAULTSCREENS=1
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 options        FONT_VT220L8x8          # 8x8 font for console
 options        RASOPS_SMALL
 
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/acorn32/conf/EB7500ATX
--- a/sys/arch/acorn32/conf/EB7500ATX   Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/acorn32/conf/EB7500ATX   Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: EB7500ATX,v 1.47 2012/03/10 21:51:48 joerg Exp $
+#      $NetBSD: EB7500ATX,v 1.48 2012/08/17 20:11:37 abs Exp $
 #
 #      EB7500ATX --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "EB7500ATX-$Revision: 1.47 $"
+#ident         "EB7500ATX-$Revision: 1.48 $"
 
 # estimated number of users
 maxusers       32
@@ -196,6 +196,7 @@
 options        WSEMUL_VT100
 
 #options       WSDISPLAY_COMPAT_RAWKBD
+options        WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 
 #options       FONT_BOLD8x16
 #options       FONT_GALLANT12x22       # Very nice font
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/acorn32/conf/INSTALL
--- a/sys/arch/acorn32/conf/INSTALL     Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/acorn32/conf/INSTALL     Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.62 2011/12/18 05:49:22 dholland Exp $
+#      $NetBSD: INSTALL,v 1.63 2012/08/17 20:11:37 abs Exp $
 #
 #      INSTALL -- NetBSD/acorn32 install configuration
 #
@@ -22,7 +22,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "INSTALL-$Revision: 1.62 $"
+#ident         "INSTALL-$Revision: 1.63 $"
 
 # estimated number of users
 maxusers       32
@@ -181,6 +181,7 @@
 options        WSEMUL_VT100
 
 #options       WSDISPLAY_COMPAT_RAWKBD
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 
 #options       FONT_BOLD8x16
 #options       FONT_GALLANT12x22       # Very nice font
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/acorn32/conf/LOWMEM_WSCONS
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS       Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS       Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: LOWMEM_WSCONS,v 1.57 2011/11/22 21:24:52 tls Exp $
+#      $NetBSD: LOWMEM_WSCONS,v 1.58 2012/08/17 20:11:37 abs Exp $
 #
 #      LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
 #
@@ -161,6 +161,7 @@
 options        WSEMUL_VT100
 
 #options       WSDISPLAY_COMPAT_RAWKBD
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 
 #options       FONT_BOLD8x16
 #options       FONT_GALLANT12x22       # Very nice font
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/acorn32/conf/NC
--- a/sys/arch/acorn32/conf/NC  Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/acorn32/conf/NC  Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NC,v 1.55 2011/11/22 21:24:52 tls Exp $
+#      $NetBSD: NC,v 1.56 2012/08/17 20:11:37 abs Exp $
 #
 #      NC - with wscons
 #
@@ -155,6 +155,8 @@
 #options       WSEMUL_SUN
 options        WSEMUL_VT100
 
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
+
 #options       FONT_BOLD8x16
 #options       FONT_GALLANT12x22       # Very nice font
 #options       FONT_LUCIDA16x29
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/algor/conf/P4032
--- a/sys/arch/algor/conf/P4032 Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/algor/conf/P4032 Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P4032,v 1.63 2011/12/18 05:49:22 dholland Exp $
+#      $NetBSD: P4032,v 1.64 2012/08/17 20:11:37 abs Exp $
 #
 # Algorithmics P-4032 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "P4032-$Revision: 1.63 $"
+#ident                 "P4032-$Revision: 1.64 $"
 
 maxusers 32
 
@@ -106,6 +106,7 @@
 
 # WS console uses SUN or VT100 terminal emulation
 #options       WSEMUL_VT100
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 
 config         netbsd  root on ? type ?
 #config                netbsd  root on sd0 type ffs
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/algor/conf/P5064
--- a/sys/arch/algor/conf/P5064 Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/algor/conf/P5064 Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P5064,v 1.72 2012/02/04 19:02:25 christos Exp $
+#      $NetBSD: P5064,v 1.73 2012/08/17 20:11:37 abs Exp $
 #
 # Algorithmics P-5064 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "P5064-$Revision: 1.72 $"
+#ident                 "P5064-$Revision: 1.73 $"
 
 maxusers 32
 
@@ -109,6 +109,7 @@
 
 # WS console uses SUN or VT100 terminal emulation
 #options       WSEMUL_VT100
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 
 config         netbsd  root on ? type ?
 #config                netbsd  root on sd0 type ffs
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/algor/conf/P6032
--- a/sys/arch/algor/conf/P6032 Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/algor/conf/P6032 Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P6032,v 1.64 2011/12/18 05:49:22 dholland Exp $
+#      $NetBSD: P6032,v 1.65 2012/08/17 20:11:37 abs Exp $
 #
 # Algorithmics P-6032 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "P6032-$Revision: 1.64 $"
+#ident                 "P6032-$Revision: 1.65 $"
 
 maxusers 32
 
@@ -101,6 +101,7 @@
 
 # WS console uses SUN or VT100 terminal emulation
 #options       WSEMUL_VT100
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 
 config         netbsd  root on ? type ?
 #config                netbsd  root on sd0 type ffs
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.344 2012/03/10 21:51:48 joerg Exp $
+# $NetBSD: GENERIC,v 1.345 2012/08/17 20:11:37 abs Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "GENERIC-$Revision: 1.344 $"
+ident          "GENERIC-$Revision: 1.345 $"
 
 maxusers 32
 
@@ -199,6 +199,7 @@
 
 # WS console uses SUN or VT100 terminal emulation
 options        WSEMUL_VT100
+options        WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 
 # realtime clock compatible to OSF/1
 #options       CLOCK_COMPAT_OSF1
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/alpha/conf/INSTALL
--- a/sys/arch/alpha/conf/INSTALL       Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/alpha/conf/INSTALL       Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.102 2011/12/18 05:49:23 dholland Exp $
+# $NetBSD: INSTALL,v 1.103 2012/08/17 20:11:37 abs Exp $
 #
 # Alpha INSTALL kernel.
 
@@ -92,6 +92,7 @@
 
 # WS console uses SUN or VT100 terminal emulation
 options        WSEMUL_VT100
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 
 config         netbsd  root on ? type ?
 
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC       Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/amiga/conf/GENERIC       Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.288 2012/06/07 23:32:47 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.289 2012/08/17 20:11:38 abs Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.288 $"
+#ident                 "GENERIC-$Revision: 1.289 $"
 
 
 maxusers       8
@@ -267,6 +267,7 @@
 #amidisplaycc0 at mainbus0             # wscons interface to custom chips
 #wsdisplay0    at amidisplaycc0 console ?
 #options       WSEMUL_VT100
+#options       WSDISPLAY_COMPAT_USL            # wsconscfg VT handling
 #options       FONT_VT220L8x10
 #options       FONT_VT220ISO8x16
 
diff -r e8b0b8bfec5b -r d1ba34f45b85 sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in    Fri Aug 17 20:10:53 2012 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in    Fri Aug 17 20:11:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.102 2012/07/09 19:42:14 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.103 2012/08/17 20:11:38 abs Exp $
 #
 ##
 # GENERIC machine description file
@@ -52,7 +52,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.102 $"



Home | Main Index | Thread Index | Old Index