--- GENERIC 2005-09-08 23:13:54.000000000 +0200 +++ ERICSSON 2006-07-26 03:59:48.000000000 +0200 @@ -64,7 +64,7 @@ #options RTC_OFFSET=-540 # hardware clock is this many mins. west of GMT # (overrides tz info that hpcboot.exe passes) -options KTRACE # system call tracing via ktrace(1) +#options KTRACE # system call tracing via ktrace(1) #options SYSTRACE # system call vetting via systrace(1) #options SYSVMSG # System V-like message queues @@ -81,7 +81,7 @@ options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) -options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel +#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # Enable experimental buffer queue strategy for better responsiveness under # high disk I/O load. Likely stable but not yet the default. @@ -102,8 +102,8 @@ #makeoptions DEBUG="-g" # compile full symbol table # Compatibility options -options COMPAT_15 # NetBSD 1.5 -options COMPAT_16 # NetBSD 1.6 +#options COMPAT_15 # NetBSD 1.5 +#options COMPAT_16 # NetBSD 1.6 options COMPAT_20 # NetBSD 2.0 #options BSDDISKLABEL_EI # endian independent disklabel support options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -117,7 +117,7 @@ #file-system MFS # memory file system (requires FFS) #file-system EXT2FS # second extended file system (linux) file-system MSDOSFS # MS-DOS file system -file-system NFS # Sun NFS-compatible filesystem client +#file-system NFS # Sun NFS-compatible filesystem client #file-system NULLFS # loopback file system #file-system UMAPFS # NULLFS + uid and gid remapping #file-system UNION # union file system @@ -136,12 +136,12 @@ # immutable) behave as system flags. # Networking options -options INET # IP + ICMP + TCP + UDP -options INET6 # IPV6 +#options INET # IP + ICMP + TCP + UDP +#options INET6 # IPV6 -options PPP_BSDCOMP # BSD-Compress compression support for PPP -options PPP_DEFLATE # Deflate compression support for PPP -options PPP_FILTER # Active filter support for PPP (requires bpf) +#options PPP_BSDCOMP # BSD-Compress compression support for PPP +#options PPP_DEFLATE # Deflate compression support for PPP +#options PPP_FILTER # Active filter support for PPP (requires bpf) #options PFIL_HOOKS # pfil(9) packet filter hooks #options IPFILTER_LOG # ipmon(8) log support @@ -162,10 +162,10 @@ # These options enable verbose messages for several subsystems. # Warning, these may compile large string tables into the kernel! -options MIIVERBOSE # verbose PHY autoconfig messages +#options MIIVERBOSE # verbose PHY autoconfig messages #options PCMCIAVERBOSE # verbose PCMCIA configuration messages -options NFS_BOOT_DHCP +#options NFS_BOOT_DHCP # # wscons options @@ -227,20 +227,20 @@ # # Serial Devices # don't need to define SCICONSOLE. you can select from bootloader. -scif0 at shb? -options SCIFCN_SPEED=19200 +#scif0 at shb? +#options SCIFCN_SPEED=19200 -adc* at shb? # analog->digital converter +#adc* at shb? # analog->digital converter -j6x0pwr* at adc? # '680 battery, on/off, etc +#j6x0pwr* at adc? # '680 battery, on/off, etc -j6x0lcd* at shb? # '680 LCD power, brightness, contrast +#j6x0lcd* at shb? # '680 LCD power, brightness, contrast -j6x0tp* at adc? # '680 touch panel -wsmouse* at j6x0tp? mux 0 # - as a pointing device -wskbd1 at j6x0tp? mux 1 # - "hard icons" as keys +#j6x0tp* at adc? # '680 touch panel +#wsmouse* at j6x0tp? mux 0 # - as a pointing device +#wskbd1 at j6x0tp? mux 1 # - "hard icons" as keys # Do not convert hard icons to key presses while serving mouse input. -options J6X0TP_WSMOUSE_EXCLUSIVE +#options J6X0TP_WSMOUSE_EXCLUSIVE # Customization for the mini-keymap of hard icons. #options J6X0TP_SETTINGS_ICON_KEYSYM="KS_Home" #options J6X0TP_PGUP_ICON_KEYSYM="KS_Prior" @@ -249,48 +249,48 @@ hd64461if* at shb? hd64461pcmcia* at hd64461if? -#options HD64461PCMCIA_REORDER_ATTACH # attach channel 1 (CF) first +options HD64461PCMCIA_REORDER_ATTACH # attach channel 1 (CF) first hd64461video* at hd64461if? # # HITACHI PERSONA (HPW-50PAD, HPQ-650PA) # -com0 at hd64461if? +#com0 at hd64461if? # # machine independent part # # PCMCIA bus support -#pcmcia* at hd64461pcmcia? controller ? socket ? +pcmcia* at hd64461pcmcia? controller ? socket ? pcmcia0 at hd64461pcmcia? controller 0 socket ? # I/O card, memory card pcmcia1 at hd64461pcmcia? controller 1 socket ? # memory card only # PCMCIA IDE controllers #wdc* at pcmcia? function ? -wdc0 at pcmcia1 function ? # CF slot -wdc1 at pcmcia0 function ? # PC Card slot +#wdc0 at pcmcia1 function ? # CF slot +#wdc1 at pcmcia0 function ? # PC Card slot # ATA (IDE) bus support #atabus* at ata? -atabus0 at wdc0 channel ? # CF slot -atabus1 at wdc1 channel ? # PC Card slot +#atabus0 at wdc0 channel ? # CF slot +#atabus1 at wdc1 channel ? # PC Card slot # IDE drives -wd* at atabus? drive ? flags 0x0000 +#wd* at atabus? drive ? flags 0x0000 # PCMCIA network interfaces -mbe* at pcmcia0 function ? # MB8696x based Ethernet -ne* at pcmcia0 function ? # NE2000-compatible Ethernet -wi* at pcmcia0 function ? # Lucent/Intersil WaveLan IEEE (802.11) +#mbe* at pcmcia0 function ? # MB8696x based Ethernet +#ne* at pcmcia0 function ? # NE2000-compatible Ethernet +#wi* at pcmcia0 function ? # Lucent/Intersil WaveLan IEEE (802.11) # MII/PHY support -lxtphy* at mii? phy ? # Level One LXT-970 PHYs -nsphyter* at mii? phy ? # NS83843 PHYs -ukphy* at mii? phy ? # generic unknown PHYs +#lxtphy* at mii? phy ? # Level One LXT-970 PHYs +#nsphyter* at mii? phy ? # NS83843 PHYs +#ukphy* at mii? phy ? # generic unknown PHYs # PCMCIA Serial Devices -com* at pcmcia? function ? # Modems and serial cards +#com* at pcmcia? function ? # Modems and serial cards # Pseudo-Devices @@ -301,9 +301,9 @@ pseudo-device fss 4 # file system snapshot device # network pseudo-devices -pseudo-device loop # network loopback -pseudo-device ppp 1 # serial-line IP ports -pseudo-device bpfilter 2 # Berkeley packet filter +#pseudo-device loop # network loopback +#pseudo-device ppp 1 # serial-line IP ports +#pseudo-device bpfilter 2 # Berkeley packet filter #pseudo-device ipfilter # IP filter, NAT #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if