Merged versions of GENERIC and MIX as well as RAMDISK and RAMDISKMIX.

2 files changed, 59 insertions, 110 deletions

diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 090356eba8d..ca1c9218aec 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.7 1998/05/29 04:15:26 rahnds Exp $
+#	$OpenBSD: GENERIC,v 1.8 1998/10/10 06:31:30 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -7,97 +7,38 @@ machine		powerpc
 
 maxusers	32
 
-# specific define for VI boards
-options		power4e
-
-# Standard system options
-option		SWAPPAGER	# swap pager (anonymous and swap space)
-option		VNODEPAGER	# vnode pager (mapped files)
-option		DEVPAGER	# device pager (mapped devices)
-option		NATIVE_ELF	# PowerPC systems uses ELF as native format
-
-option		DIAGNOSTIC	# extra kernel debugging checks
-option		KTRACE		# system call tracing support
-option		DEBUG		# extra kernel debugging support
-
-option		FIREPOWERBUGS	# FirePower problem workaround...
-option		PPC_MPC106_BUG	# MPC106 PCI IFC chip bug workaround...
-
-#option		IPKDBUSERHACK
-option		DDB
-
-# System V options                 
-option		SYSVMSG         # System V-like message queues
-option		SYSVSEM         # System V-like semaphores
-option		SYSVSHM         # System V-like memory sharing       
-#option		SHMMAXPGS=1024  # 1024 pages is the default
-
-# Filesystem options
-option		FFS,QUOTA	# fast filesystem with user and group quotas
-option		MFS		# memory-based filesystem
-
-option		NFSCLIENT	# Sun NFS-compatible filesystem (client)
-option		NFSSERVER	# Sun NFS-compatible filesystem (server)
-
-option		CD9660		# ISO 9660 + Rock Ridge file system
-option		MSDOSFS		# Ability to read write MS-Dos filsystem
-option		FDESC		# user file descriptor filesystem (/dev/fd)
-option		FIFO		# POSIX fifo support (in all filesystems)
-option		KERNFS		# kernel data-structure filesystem
-option		NULLFS		# null layer filesystem
-option		PORTAL		# portal filesystem (still experimental)
-option		PROCFS		# /proc
-option		UMAPFS		# uid/gid remapping filesystem
-option		UNION		# union file system
-
-# Networking options
-#option		GATEWAY         # IP packet forwarding
-option		INET            # Internet protocols
-option		IPSEC           # IP Security
-#option		NS              # XNS
-#option		IPX             # IPX+SPX
-#option		IPXIP		# IPX tunneling over IP
-#option		ISO,TPIP        # OSI networking
-#option		EON             # OSI tunneling over IP
-#option		CCITT,LLC,HDLC  # X.25
-option		IPFILTER        # IP packet filter for security
-option		IPFILTER_LOG	# use /dev/ipl to log IPF
-option		PPP_BSDCOMP	# PPP BSD compression
-option		PPP_DEFLATE
-
-#option		TCP_COMPAT_42   # compatibility with 4.2BSD TCP/IP
-#option		MULTICAST       # Multicast support
-#option		MROUTING        # Multicast routing support
+# default type, instructs system to try to determin what proper type is
+# actual machine type probed via name of openfirmware root node.
+option		SYS_TYPE=OFWMACH
 
+option		FIREPOWERBUGS
+options		PPC_MPC106_BUG
 
-config		bsd	swap generic
+include "../../../conf/GENERIC"
 
-#
-#  Now the Machine specification
-#
-mainbus0	at root
-cpu*		at mainbus0
+config		bsd	swap generic
 
-mpcpcibr*	at mainbus0	# MPC106 PCI Bridge.
-isabr*		at mainbus0	# ISA dev bridge.
 
 
 #### ISA Bus devices.
 
 isa*		at isabr?
 
-com0		at isa? port 0x2e8 irq 5
-com1		at isa? port 0x3e8 irq 1
+com0		at isa? port 0x3f8 irq 4
+com1		at isa? port 0x2f8 irq 3
+com2		at isa? port 0x3e8 irq 1	#addresses for VI board com1
+com3		at isa? port 0x2e8 irq 5	#addresses for VI board com0
 
+pcppi0		at isa?			# PC prog. periph. interface
+pckbd0		at pcppi?			# PC keyboard (kbd port)
+pms0		at pcppi?			# PS/2-style mouse (aux port)
 
-#### PCI Bus devices.
+vga0		at isa?			# ISA VGA
 
-pci*		at mpcpcibr?
-ncr*		at pci? dev ? function ?
-scsibus*	at ncr?
-de*		at pci? dev ? function ?
-#vme*		at pci? dev ? function ?
+#### Workstation Console attachments
 
+wscons*		at vga?
+wscons*		at vgafb?
 
 #### SCSI Bus devices
  
@@ -108,19 +49,11 @@ ch*		at scsibus? target ? lun ?
 ss*		at scsibus? target ? lun ?
 uk*		at scsibus? target ? lun ?
 
+#### openfirmware devices
+# mostly unused currently 
+ofbus*		at openfirm?
+ofrtc*		at openfirm?
+ofdisk*		at openfirm?	 # used for floppy support
+#ofnet*		at openfirm?
+#ofcons*	at openfirm?
 
-#### PSEUDO Devices
-
-pseudo-device	loop		 2	# network loopback
-pseudo-device	bpfilter	 8	# packet filter ports
-pseudo-device	sl		 2	# serial-line IP ports
-pseudo-device	ppp		 2	# serial-line PPP ports
-pseudo-device	tun		 2	# network tunneling over tty
-pseudo-device	enc		 1	# encryption device
-#pseudo-device	strip		 1	# Starmode Radio IP interface  
-
-pseudo-device	pty		64	# pseudo ptys
-pseudo-device	random		 1
-pseudo-device	rd		 1	# ram disk
-pseudo-device	vnd		 4	# paging to files
-pseudo-device	ccd		 4	# concatenated disk devices
diff --git a/sys/arch/powerpc/conf/RAMDISK b/sys/arch/powerpc/conf/RAMDISK
index 3858b33bef1..2ae542a6c35 100644
--- a/sys/arch/powerpc/conf/RAMDISK
+++ b/sys/arch/powerpc/conf/RAMDISK
@@ -10,10 +10,12 @@ maxusers	8
 option		SWAPPAGER
 option		DEVPAGER
 
-option		FIREPOWERBUGS
+# default type, instructs system to try to determin what proper type is
+# actual machine type probed via name of openfirmware root node.
+option		SYS_TYPE=OFWMACH
 
-# specific define for VI boards
-options		power4e
+option		FIREPOWERBUGS
+options		PPC_MPC106_BUG
 
 #options		KTRACE
 #options		DEBUG
@@ -34,21 +36,18 @@ options		INET
 # Specify storage configuration using ramdisk
 config		bsd	root on rd0a swap on rd0b
 
+#
+#  Now the Machine specification
+#
 mainbus0	at root
 cpu*		at mainbus0
 
+ofroot*		at mainbus0
+mpcpcibr*	at mainbus0	# MPC106 PCI Bridge.
+isabr*		at pci?		# ISA dev bridge.
 mpcpcibr*	at mainbus0	# MPC106 PCI Bridge.
 isabr*		at mainbus0	# ISA dev bridge.
 
-
-#### ISA Bus devices.
-
-isa*		at isabr?
-
-com0		at isa? port 0x2e8 irq 5
-com1		at isa? port 0x3e8 irq 1
-
-
 #### PCI Bus devices.
 
 pci*		at mpcpcibr?
@@ -56,24 +55,41 @@ ncr*		at pci? dev ? function ?
 scsibus*	at ncr?
 de*		at pci? dev ? function ?
 #vme*		at pci? dev ? function ?
+#vga*		at pci? dev ? function ?	# PCI VGA graphics 
+#vgafb0		at pci? dev ? function ?	# PCI VGA graphics 
+
+#### ISA Bus devices.
+
+isa*		at isabr?
 
+com0		at isa? port 0x3f8 irq 4
+com1		at isa? port 0x2f8 irq 3
+com2		at isa? port 0x3e8 irq 1	#addresses for VI board com1
+com3		at isa? port 0x2e8 irq 5	#addresses for VI board com0
 
 #### SCSI Bus devices
  
 sd*		at scsibus? target ? lun ?
 st*		at scsibus? target ? lun ?            
 cd*		at scsibus? target ? lun ?
-ch*		at scsibus? target ? lun ?
-ss*		at scsibus? target ? lun ?
-uk*		at scsibus? target ? lun ?
-
+#ch*		at scsibus? target ? lun ?
+#ss*		at scsibus? target ? lun ?
+#uk*		at scsibus? target ? lun ?
+
+#### openfirmware devices
+# mostly unused currently 
+ofbus*		at openfirm?
+ofrtc*		at openfirm?
+#ofdisk*	at openfirm?	 # used for floppy support
+#ofnet*		at openfirm?
+#ofcons*	at openfirm?
 
 #### PSEUDO Devices
 
 pseudo-device	loop		 1	# network loopback
 #pseudo-device	bpfilter	 8	# packet filter ports
 #pseudo-device	sl		 2	# serial-line IP ports
-pseudo-device	ppp		 2	# serial-line PPP ports
+pseudo-device	ppp		 1	# serial-line PPP ports
 #pseudo-device	tun		 2	# network tunneling over tty
 
 #pseudo-device	pty		64	# pseudo ptys