[src/netbsd-1-5]: src/sys/arch/x68k/conf Pullup rev. 1.48 from the trunk.

[minoura <minoura%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/78ad54d3a9ac
branches:  netbsd-1-5
changeset: 488513:78ad54d3a9ac
user:      minoura <minoura%NetBSD.org@localhost>
date:      Fri Jul 14 15:33:02 2000 +0000

description:
Pullup rev. 1.48 from the trunk.
Make GENERIC kernel run with 4MB memory.

diffstat:

 sys/arch/x68k/conf/GENERIC |  44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diffs (133 lines):

diff -r 28cec09badbf -r 78ad54d3a9ac sys/arch/x68k/conf/GENERIC
--- a/sys/arch/x68k/conf/GENERIC        Fri Jul 14 14:37:58 2000 +0000
+++ b/sys/arch/x68k/conf/GENERIC        Fri Jul 14 15:33:02 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.46.2.1 2000/06/23 14:36:15 fvdl Exp $
+#      $NetBSD: GENERIC,v 1.46.2.2 2000/07/14 15:33:02 minoura Exp $
 
 #
 #      GENERIC
@@ -6,9 +6,9 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident                 "GENERIC-$Revision: 1.46.2.1 $"
+#ident                 "GENERIC-$Revision: 1.46.2.2 $"
 
-maxusers       32
+maxusers       8
 
 ## System kernel configuration.  See options(4) for more detail.
 
@@ -99,7 +99,7 @@
 #options       DEBUG
 
 ## Make SCSI error messages more verbose when explaining their meanings.
-options        SCSIVERBOSE
+#options       SCSIVERBOSE
 
 ## `INSECURE' turns off the kernel security level (securelevel = 0 always).
 ## This allows writing to /dev/mem, loading kernel modules while multi-user,
@@ -153,7 +153,7 @@
 
 ## File system options.
 options        NFSSERVER       # Sun NFS-compatible filesystem server
-options        QUOTA           # FFS quotas
+#options       QUOTA           # FFS quotas
 #options       FFS_EI          # FFS Endian Independent support
 options        SOFTDEP         # FFS soft updates support.
 
@@ -163,7 +163,7 @@
 #options       IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
 #options       IPSEC_DEBUG     # debug for IP security
-options        TCP_COMPAT_42   # 4.2BSD IP implementation compatibility
+#options       TCP_COMPAT_42   # 4.2BSD IP implementation compatibility
 #options       GATEWAY         # packet forwarding ("router switch")
 #options       MROUTING        # packet forwarding of multicast packets
 #options       DIRECTED_BROADCAST      # allow broadcasts through routers
@@ -172,14 +172,14 @@
 #options       ISO,TPIP        # OSI networking
 #options       EON             # OSI tunneling over IP
 #options       CCITT,LLC,HDLC  # X.25 packet switched protocol
-options        NETATALK        # AppleTalk (over Ethernet) protocol
-options        NTP             # Network Time Protocol in-kernel support
+#options       NETATALK        # AppleTalk (over Ethernet) protocol
+#options       NTP             # Network Time Protocol in-kernel support
 #options       PPS_SYNC        # Add serial line synchronization for NTP
 options        PFIL_HOOKS      # Add pfil(9) hooks, intended for custom LKMs.
-options        IPFILTER_LOG    # Add ipmon(8) logging for ipfilter device
-options        PPP_BSDCOMP     # Add BSD compression to ppp device
-options        PPP_DEFLATE     # Add deflate (libz) compression to ppp device
-options        PPP_FILTER      # Add active filters for ppp (via bpf)
+#options       IPFILTER_LOG    # Add ipmon(8) logging for ipfilter device
+#options       PPP_BSDCOMP     # Add BSD compression to ppp device
+#options       PPP_DEFLATE     # Add deflate (libz) compression to ppp device
+#options       PPP_FILTER      # Add active filters for ppp (via bpf)
 
 
 
@@ -216,9 +216,9 @@
 
 sd*    at scsibus? target ? lun ?      # SCSI disks
 cd*    at scsibus? target ? lun ?      # SCSI CD-ROMs
-st*    at scsibus? target ? lun ?      # SCSI tapes
+#st*   at scsibus? target ? lun ?      # SCSI tapes
 #ss*   at scsibus? target ? lun ?      # SCSI scanners
-ch*    at scsibus? target ? lun ?      # SCSI changer devices
+#ch*   at scsibus? target ? lun ?      # SCSI changer devices
 #uk*   at scsibus? target ? lun ?      # SCSI unknown devices
 
 ## Ports
@@ -260,11 +260,11 @@
 ## Concatenated and striped disks; with this, you can create a software-based
 ## disk array similar to a "RAID 0" setup.  See ccd(4).
 
-pseudo-device  ccd     4
+#pseudo-device ccd     4
 
 ## RAIDframe disk driver: software RAID driver.  See raid(4).
 
-pseudo-device  raid    4
+#pseudo-device raid    4
 #options       RAID_AUTOCONFIG         # auto-configuration of RAID components
 
 ## Memory disk device, used on boot floppies with compressed
@@ -283,21 +283,21 @@
 
 ## Network "tunnel" device, allowing protocol stacks to run in the userland.
 ## This is used by the third-party user-mode "ppp" program, and others.
-pseudo-device  tun             4
+#pseudo-device tun             4
 
 ## Generic L3 over IP tunnel
 #pseudo-device gre             2       # generic L3 over IP tunnel
 
 ## Berkeley Packet Filter, required to run RARPD.  A generic C-language
 ## interface that allows selective examining of incoming packets.
-pseudo-device  bpfilter        8
+pseudo-device  bpfilter        4
 
 ## IP Filter, used in firewall and NAT applications.  See ipnat(8) for
 ## one example of the use of the IP Filter.
-pseudo-device  ipfilter
+#pseudo-device ipfilter
 
 ## for IPv6
-pseudo-device  gif             4       # IPv[46] over IPv[46] tunnel (RFC1933)
+pseudo-device  gif             1       # 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
 
@@ -309,9 +309,9 @@
 ## number still requires you to run /dev/MAKEDEV to create the files
 ## for the ptys.
 
-pseudo-device  pty             32      # pseudo-ttys (for network, etc.)
+pseudo-device  pty             16      # pseudo-ttys (for network, etc.)
 
 ## Random device, used to implement /dev/random (a source of random noise),
 ## and generate randomness for some kernel formulae.
 
-pseudo-device  rnd
+#pseudo-device rnd