From a2cea03cf29029f55009e3e411b673912101ca13 Mon Sep 17 00:00:00 2001 From: reinoud Date: Wed, 30 Jan 2002 14:01:33 +0000 Subject: [PATCH] Update and clean the config files to look more equal ... some non standard configutations were not updated during time. --- sys/arch/acorn32/conf/GENERIC | 62 ++++++++++++++++++------ sys/arch/acorn32/conf/INSTALL | 75 ++++++++++++++++++++--------- sys/arch/acorn32/conf/RPC_WSCONS | 83 +++++++++++++++++++++++++------- 3 files changed, 164 insertions(+), 56 deletions(-) diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC index ffbee6760a23..bcbbaaf23153 100644 --- a/sys/arch/acorn32/conf/GENERIC +++ b/sys/arch/acorn32/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.9 2002/01/27 13:23:08 jdolecek Exp $ +# $NetBSD: GENERIC,v 1.10 2002/01/30 14:01:33 reinoud Exp $ # # GENERIC --- NetBSD/acorn32 complete configuration # @@ -20,7 +20,7 @@ include "arch/acorn32/conf/std.acorn32" -#ident "GENERIC-$Revision: 1.9 $" +#ident "GENERIC-$Revision: 1.10 $" # estimated number of users maxusers 32 @@ -34,9 +34,12 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT options CPU_SA110 # Support the SA110 core options CPU_ARM6 # Support the ARM6 core options CPU_ARM7 # Support the ARM7 core -options CPU_ARM8 # Support the ARM8 core +#options CPU_ARM8 # Support the ARM8 core #options ARM6_LATE_ABORT # ARM6XX late abort support +# For StrongARM only kernels +#makeoptions COPTS="-O2 -march=armv3m -mtune=strongarm" + # Architecture options options RISCPC # We are a RiscPC @@ -102,7 +105,7 @@ options COMPAT_12 # NetBSD 1.2 compatibility. #options COMPAT_09 # NetBSD 0.9 compatibility. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -# Bootloader options +# Bootloader options (has to go !) options COMPAT_OLD_BOOTLOADER # Shared memory options @@ -120,7 +123,7 @@ options SHMMAXPGS=1024 # 1024 pages is the default options MEMORY_DISK_HOOKS # boottime setup of ramdisk #options MEMORY_DISK_SIZE=0 # Size in blocks -#options MINIROOTSIZE=3800 # Size in blocks +#options MINIROOTSIZE=4100 # Size in blocks #options MEMORY_DISK_IS_ROOT # use memory disk as root # Miscellaneous kernel options @@ -160,15 +163,6 @@ iomd0 at mainbus? # system clock via IOMD clock* at iomd? -# kbd via IOMD -kbd* at iomd? - -# quadrature mouse via IOMD -qms* at iomd? - -# PS2 mouse via IOMD -opms* at iomd? - # IIC bus device iic* at iomd? @@ -181,8 +175,44 @@ todclock0 at rtc? # VIDC device vidc0 at mainbus? -# The vidc -vidcconsole0 at vidc? +# WSCONS +# ws console uses DUMB, SUN or VT100 terminal emulation +#options WSEMUL_NODUMB +#options WSEMUL_SUN +#options WSEMUL_VT100 + +#options WSDISPLAY_COMPAT_RAWKBD + +#options FONT_BOLD8x16 +#options FONT_GALLANT12x22 # Very nice font +#options FONT_LUCIDA16x29 +#options FONT_OMRON12x20 # looks funny +#options FONT_QVSS8x15 # broken ? +#options FONT_SONY12x25 # looks like VT220 font +#options FONT_SONY8x16 # not tested +#options FONT_VT220L8x8 # 8x8 font as in Arch. cons +#options FONT_VT220L8x16 # 8x(2x8) font as in Arch. cons +#options FONT_VT220L8x10 # not tested +#options FONT_VT220L8x20 # not tested + +#vidcvideo0 at vidc? # wscons driver for VIDC +#wsdisplay* at vidcvideo? console ? # display itself + +#rpckbd* at iomd? # based on old `kbd' driver +#wskbd* at rpckbd? # wskbd on RiscPC keyboard + +#wsqms* at iomd? # ws quadmouse driver +#wsmouse* at wsqms? # wsmouse on ws quadmouse + +#pseudo-device wsmux + +# The origional vidcconsole : +# vidcconsole kbd at IOMD +# vidcconsole PS2 mouse at IOMD +vidcconsole0 at vidc? # display + vt100 emulation +kbd* at iomd? # PS/2 keyboard for vidcconsole +qms* at iomd? # RiscPC mouse for vidcconsole +opms* at iomd? # A7000/NC? mouse for vidcconsole # generic VT console device vt0 at vidc? diff --git a/sys/arch/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL index e9d56824cddb..2c0642726876 100644 --- a/sys/arch/acorn32/conf/INSTALL +++ b/sys/arch/acorn32/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.2 2002/01/27 13:23:09 jdolecek Exp $ +# $NetBSD: INSTALL,v 1.3 2002/01/30 14:01:33 reinoud Exp $ # # INSTALL -- NetBSD/acorn32 install configuration # @@ -20,7 +20,7 @@ include "arch/acorn32/conf/std.acorn32" -#ident "INSTALL-$Revision: 1.2 $" +#ident "INSTALL-$Revision: 1.3 $" # estimated number of users maxusers 32 @@ -37,6 +37,9 @@ options CPU_ARM7 # Support the ARM7 core #options CPU_ARM8 # Support the ARM8 core #options ARM6_LATE_ABORT # ARM6XX late abort support +# For StrongARM only kernels +#makeoptions COPTS="-O2 -march=armv3m -mtune=strongarm" + # Architecture options options RISCPC # We are a RiscPC @@ -102,7 +105,7 @@ options COMPAT_12 # NetBSD 1.2 compatibility. #options COMPAT_09 # NetBSD 0.9 compatibility. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -# Bootloader options +# Bootloader options (has to go !) #options COMPAT_OLD_BOOTLOADER # Shared memory options @@ -160,15 +163,6 @@ iomd0 at mainbus? # system clock via IOMD clock* at iomd? -# kbd via IOMD -kbd* at iomd? - -# quadrature mouse via IOMD -qms* at iomd? - -# PS2 mouse via IOMD -opms* at iomd? - # IIC bus device iic* at iomd? @@ -181,16 +175,53 @@ todclock0 at rtc? # VIDC device vidc0 at mainbus? -# The vidc -vidcconsole0 at vidc? +# WSCONS +# ws console uses DUMB, SUN or VT100 terminal emulation +#options WSEMUL_NODUMB +#options WSEMUL_SUN +options WSEMUL_VT100 + +#options WSDISPLAY_COMPAT_RAWKBD + +#options FONT_BOLD8x16 +#options FONT_GALLANT12x22 # Very nice font +#options FONT_LUCIDA16x29 +#options FONT_OMRON12x20 # looks funny +#options FONT_QVSS8x15 # broken ? +options FONT_SONY12x25 # looks like VT220 font +options FONT_SONY8x16 # not tested +#options FONT_VT220L8x8 # 8x8 font as in Arch. cons +#options FONT_VT220L8x16 # 8x(2x8) font as in Arch. cons +#options FONT_VT220L8x10 # not tested +#options FONT_VT220L8x20 # not tested + +vidcvideo0 at vidc? # wscons driver for VIDC +wsdisplay* at vidcvideo? console ? # display itself + +rpckbd* at iomd? # based on old `kbd' driver +wskbd* at rpckbd? # wskbd on RiscPC keyboard + +wsqms* at iomd? # ws quadmouse driver +wsmouse* at wsqms? # wsmouse on ws quadmouse + +pseudo-device wsmux + +# The origional vidcconsole : +# vidcconsole kbd at IOMD +# vidcconsole PS2 mouse at IOMD +#vidcconsole0 at vidc? # display + vt100 emulation +#kbd* at iomd? # PS/2 keyboard for vidcconsole +#qms* at iomd? # RiscPC mouse for vidcconsole +#opms* at iomd? # A7000/NC? mouse for vidcconsole # generic VT console device -vt0 at vidc? -vt1 at vidc? -vt2 at vidc? -vt3 at vidc? -vt4 at vidc? -vt5 at vidc? +#vt0 at vidc? +#vt1 at vidc? +#vt2 at vidc? +#vt3 at vidc? +#vt4 at vidc? +#vt5 at vidc? + # Peripheral IO Controller pioc0 at mainbus? base 0x00210000 @@ -223,8 +254,8 @@ lpt* at pioc? offset 0x0278 irq 0 beep0 at vidc? # Audio device -#vidcaudio0 at vidc? -#audio* at vidcaudio0 +vidcaudio0 at vidc? +audio* at vidcaudio0 # System beep sysbeep0 at vidc? diff --git a/sys/arch/acorn32/conf/RPC_WSCONS b/sys/arch/acorn32/conf/RPC_WSCONS index 820426522d42..f054adfcdd27 100644 --- a/sys/arch/acorn32/conf/RPC_WSCONS +++ b/sys/arch/acorn32/conf/RPC_WSCONS @@ -1,12 +1,28 @@ -# $NetBSD: RPC_WSCONS,v 1.7 2002/01/27 13:23:09 jdolecek Exp $ +# $NetBSD: RPC_WSCONS,v 1.8 2002/01/30 14:01:33 reinoud Exp $ # # RPC_WSCONS -- Full RiscPC config with wscons # +# This machine description file is used to generate the default NetBSD +# kernel. This wscons kernel does not include all options, subsystems +# and device drivers, but should be useful for most applications. +# +# The machine description file can be customised for your specific +# machine to reduce the kernel size and improve its performance. +# +# For further information on compiling NetBSD kernels, see the config(8) +# man page. +# +# For further information on hardware support for this architecture, see +# the intro(4) man page. For further information about kernel options +# for this architecture, see the options(4) man page. For an explanation +# of each device driver in this file see the section 4 man page for the +# device. -include "arch/acorn32/conf/std.acorn32" +include "arch/acorn32/conf/std.acorn32" + +#ident "GENERIC-$Revision: 1.8 $" # estimated number of users - maxusers 32 # Standard system options @@ -29,7 +45,6 @@ options CPU_ARM7 # Support the ARM7 core options RISCPC # We are a RiscPC # FPA options - #options ARMFPE # ARM Ltd FPE # File systems @@ -46,6 +61,7 @@ file-system FDESC # /dev/fd file-system FILECORE # Acorn filecore file system file-system KERNFS # /kern file-system NULLFS # loopback file system +file-system OVERLAY # overlay filesystem file-system PORTAL # portal filesystem (still experimental) file-system PROCFS # /proc file-system UMAPFS # NULLFS + uid and gid remapping @@ -53,6 +69,8 @@ file-system UNION # union file system # File system options options QUOTA # UFS quotas +#options FFS_EI # FFS Endian Independant support +options SOFTDEP # FFS soft updates support. options NFSSERVER # Networking options @@ -61,7 +79,7 @@ options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 #options IPSEC # IP security -#options IPSEC_ESP # IP security (encryption part; define w/ IPSEC) +#options IPSEC_ESP # IP security (encryption part; define w/IPSEC) #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing #options NS # XNS @@ -87,13 +105,17 @@ options COMPAT_12 # NetBSD 1.2 compatibility. #options COMPAT_09 # NetBSD 0.9 compatibility. #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. -# Bootloader options +# Bootloader options (has to go !) #options COMPAT_OLD_BOOTLOADER # Shared memory options options SYSVMSG # System V-like message queues options SYSVSEM # System V-like semaphores +#options SEMMNI=10 # number of semaphore identifiers +#options SEMMNS=60 # number of semaphores in system +#options SEMUME=10 # max number of undo entries per process +#options SEMMNU=30 # number of undo structures in system options SYSVSHM # System V-like memory sharing options SHMMAXPGS=1024 # 1024 pages is the default @@ -101,7 +123,7 @@ options SHMMAXPGS=1024 # 1024 pages is the default options MEMORY_DISK_HOOKS # boottime setup of ramdisk #options MEMORY_DISK_SIZE=0 # Size in blocks -#options MINIROOTSIZE=3400 # Size in blocks +#options MINIROOTSIZE=3800 # Size in blocks #options MEMORY_DISK_IS_ROOT # use memory disk as root # Miscellaneous kernel options @@ -109,13 +131,14 @@ options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics +#options SCSIVERBOSE # Verbose SCSI errors #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) # Development and Debugging options #options ARM700BUGTRACK # track the ARM700 swi bug #options PORTMASTER # Enable PortMaster only options -#options DIAGNOSTIC # internally consistency checks +#options DIAGNOSTIC # internal consistency checks #options PMAP_DEBUG # Enable pmap_debug_level code #options IPKDB # remote kernel debugging options DDB # in-kernel debugger @@ -192,13 +215,12 @@ pseudo-device wsmux #opms* at iomd? # A7000/NC? mouse for vidcconsole # generic VT console device -#vt0 at vidc? -#vt1 at vidc? -#vt2 at vidc? -#vt3 at vidc? -#vt4 at vidc? -#vt5 at vidc? - +#vt0 at vidc? +#vt1 at vidc? +#vt2 at vidc? +#vt3 at vidc? +#vt4 at vidc? +#vt5 at vidc? # Peripheral IO Controller pioc0 at mainbus? base 0x00210000 @@ -258,7 +280,7 @@ scsibus* at oak? csa* at podulebus? # Cumana SCSI I adpater scsibus* at csa? -hcsc* at podulebus0 slot ? # HCCS 8-bit SCSI interface +hcsc* at podulebus0 slot ? # HCCS 8-bit SCSI interface scsibus* at hcsc? sd* at scsibus? target ? lun ? # SCSI disk drives @@ -268,6 +290,14 @@ ch* at scsibus? target ? lun ? # SCSI auto-changers uk* at scsibus? target ? lun ? # SCSI unknown device ss* at scsibus? target ? lun ? # SCSI scanner +dtide* at podulebus? # D.T. Software IDE card +wd* at dtide? channel ? drive ? +atapibus* at dtide? channel ? + +hcide* at podulebus? # HCCS IDE card +wd* at hcide? channel ? drive ? +atapibus* at hcide? channel ? + icside* at podulebus? # ICS IDE card wd* at icside? channel ? drive ? atapibus* at icside? channel ? @@ -292,15 +322,32 @@ pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP +pseudo-device pppoe # PPP over Ethernet (RFC 2516) pseudo-device tun 2 # network tunneling over tty +#pseudo-device gre 2 # generic L3 over IP tunnel #pseudo-device ipfilter 1 # ip filter -#pseudo-device strip 4 # STRIP +pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) +#pseudo-device faith 1 # IPv[46] tcp relay translation i/f +#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation +#pseudo-device strip 4 # STarmode Radio IP (Metricon Ricochet) +pseudo-device vlan # IEEE 802.1q encapsulation +pseudo-device bridge # simple inter-network bridging pseudo-device pty # pseudo-terminals pseudo-device tb 1 # tablet line discipline pseudo-device vnd 4 # disk-like interface to files pseudo-device ccd 2 # concatenated disk devices +pseudo-device raid 8 # RAIDframe disk driver +options RAID_AUTOCONFIG # auto-configuration of RAID components +# Options to enable various other RAIDframe RAID types. +# options RF_INCLUDE_EVENODD=1 +# options RF_INCLUDE_RAID5_RS=1 +# options RF_INCLUDE_PARITYLOGGING=1 +# options RF_INCLUDE_CHAINDECLUSTER=1 +# options RF_INCLUDE_INTERDECLUSTER=1 +# options RF_INCLUDE_PARITY_DECLUSTERING=1 +# options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 pseudo-device md 1 # Ramdisk driver -pseudo-device rnd # /dev/random and /dev/urandom +pseudo-device rnd # /dev/random and in-kernel generator makeoptions MONITOR="Taxan875+LR" #makeoptions MONITOR="AKF60"