summaryrefslogtreecommitdiff
path: root/sys/arch/powerpc/conf
diff options
context:
space:
mode:
authorPer Fogelstrom <pefo@cvs.openbsd.org>1998-04-06 17:29:27 +0000
committerPer Fogelstrom <pefo@cvs.openbsd.org>1998-04-06 17:29:27 +0000
commit8754e4e58eda1afb7cc46fcb39b7ce83f71f05a9 (patch)
tree22819b43d29c532b1cc26f180c53f483b600becd /sys/arch/powerpc/conf
parent89ba7b01211022ae9d8a14057a246e38ca064ee7 (diff)
New config stuff + Makefile fix to make gcc 2.8.1 work. Thanks to Dale Rahn!
Diffstat (limited to 'sys/arch/powerpc/conf')
-rw-r--r--sys/arch/powerpc/conf/GENERIC31
-rw-r--r--sys/arch/powerpc/conf/Makefile.powerpc4
-rw-r--r--sys/arch/powerpc/conf/files.powerpc3
3 files changed, 25 insertions, 13 deletions
diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 5daab8b7b41..ad27de9c553 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,3 +1,4 @@
+# $OpenBSD: GENERIC,v 1.6 1998/04/06 17:29:24 pefo Exp $
#
# PPC GENERIC config file
#
@@ -17,26 +18,29 @@ 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
+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
+#option SHMMAXPGS=1024 # 1024 pages is the default
# Filesystem options
-option CD9660 # ISO 9660 + Rock Ridge file system
-option FDESC # user file descriptor filesystem (/dev/fd)
-option FIFO # POSIX fifo support (in all filesystems)
option FFS,QUOTA # fast filesystem with user and group quotas
-option KERNFS # kernel data-structure filesystem
option MFS # memory-based filesystem
-option MSDOSFS # Ability to read write MS-Dos filsystem
+
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
@@ -49,11 +53,14 @@ 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 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
@@ -101,11 +108,13 @@ uk* at scsibus? target ? lun ?
#### PSEUDO Devices
-pseudo-device loop 1 # network loopback
+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 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
diff --git a/sys/arch/powerpc/conf/Makefile.powerpc b/sys/arch/powerpc/conf/Makefile.powerpc
index b7edd6476c8..f1033d2882e 100644
--- a/sys/arch/powerpc/conf/Makefile.powerpc
+++ b/sys/arch/powerpc/conf/Makefile.powerpc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.powerpc,v 1.6 1997/10/13 13:49:56 pefo Exp $
+# $OpenBSD: Makefile.powerpc,v 1.7 1998/04/06 17:29:25 pefo Exp $
#
# Makefile for OpenBSD PowerPC
#
@@ -44,7 +44,7 @@ CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL \
CWARNFLAGS= -Werror -Wreturn-type
CFLAGS= ${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
AFLAGS= -D_LOCORE
-LINKFLAGS= -N -Ttext 100000 -e start
+LINKFLAGS= -N -Ttext 100074 -e start
STRIPFLAGS= -d
HOSTCC?= ${CC}
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index f52056c5a9b..0ce47b4103c 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -74,3 +74,6 @@ define pcmcia {} # XXX dummy decl...
include "../../../dev/pci/files.pci"
include "../../../dev/isa/files.isa"
major { wd = 4 }
+
+include "../../../dev/isa/files.isapnp"
+file arch/arc/isa/isapnp_machdep.c isapnp