diff options
author | Per Fogelstrom <pefo@cvs.openbsd.org> | 1997-10-13 09:39:35 +0000 |
---|---|---|
committer | Per Fogelstrom <pefo@cvs.openbsd.org> | 1997-10-13 09:39:35 +0000 |
commit | 729c83bc463a59906fbd1e12dede271079ec200d (patch) | |
tree | e7cd11a8b888645da97f74e8a50f9f677b269e34 | |
parent | b5985586a359dd5f8cdf6e269aab0972a73edaac (diff) |
Monolithic PowerPC kernel configuration files
-rw-r--r-- | sys/arch/powerpc/conf/DDB | 104 | ||||
-rw-r--r-- | sys/arch/powerpc/conf/GENERIC | 153 | ||||
-rw-r--r-- | sys/arch/powerpc/conf/MINI | 76 | ||||
-rw-r--r-- | sys/arch/powerpc/conf/Makefile.powerpc | 9 | ||||
-rw-r--r-- | sys/arch/powerpc/conf/NFS | 69 | ||||
-rw-r--r-- | sys/arch/powerpc/conf/TST | 67 | ||||
-rw-r--r-- | sys/arch/powerpc/conf/TST.net | 67 | ||||
-rw-r--r-- | sys/arch/powerpc/conf/TST1 | 69 | ||||
-rw-r--r-- | sys/arch/powerpc/conf/TSTdbg | 69 | ||||
-rw-r--r-- | sys/arch/powerpc/conf/files.powerpc | 46 |
10 files changed, 197 insertions, 532 deletions
diff --git a/sys/arch/powerpc/conf/DDB b/sys/arch/powerpc/conf/DDB index a8ce76d5158..02566b89764 100644 --- a/sys/arch/powerpc/conf/DDB +++ b/sys/arch/powerpc/conf/DDB @@ -7,66 +7,94 @@ machine powerpc maxusers 32 # Standard system options (should go into std.powerpc?) -options SWAPPAGER, VNODEPAGER, DEVPAGER -options MACHINE_NONCONTIG -options EXEC_ELF -options EXEC_SCRIPT +option SWAPPAGER, VNODEPAGER, DEVPAGER +option EXEC_ELF +option EXEC_SCRIPT # various hacks due to bugs in Openfirmware implementation -options FIREPOWERBUGS +option FIREPOWERBUGS -#options IPKDBUSERHACK +#option IPKDBUSERHACK #makeoptions DEBUG="-g" options DDB options KTRACE options SYSCALL_DEBUG -options TCP_COMPAT_42 -options COMPAT_43 -options COMPAT_09 -options COMPAT_10 -options COMPAT_12 +#option TCP_COMPAT_42 +#option COMPAT_43 +#option COMPAT_09 +#option COMPAT_10 +#option COMPAT_12 -options FFS -options MFS +option FFS +#option MFS -options NFSCLIENT -options NFSSERVER +option NFSCLIENT +option NFSSERVER -options CD9660 -options MSDOSFS -options FDESC +option CD9660 +option MSDOSFS +option FDESC options FIFO options KERNFS -options NULLFS -options PORTAL -options PROCFS -options UMAPFS -options UNION +option NULLFS +#option PORTAL +option PROCFS +#option UMAPFS +option UNION options INET options NMBCLUSTERS=1024 -options MAXUSERS=20 -#options TARGET_ELF - config bsd swap generic -ofroot* at root +# +# Now the Machine specification +# +mainbus0 at root +cpu* at mainbus0 + +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? +ncr* at pci? dev ? function ? +scsibus* at ncr? +de* at pci? dev ? function ? +#vme* at pci? dev ? function ? -ofbus* at openfirm? -ofdisk* at openfirm? +#### 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 ? -ofnet* at openfirm? -#ipkdbif0 at ofnet? -ofcons* at openfirm? +#### PSEUDO Devices -ofrtc* at openfirm? +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 tun 2 # network tunneling over tty -pseudo-device loop -pseudo-device pty 64 -pseudo-device random 1 -pseudo-device rd -pseudo-device vnd 1 +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/GENERIC b/sys/arch/powerpc/conf/GENERIC index bc504a1c253..75b989846e4 100644 --- a/sys/arch/powerpc/conf/GENERIC +++ b/sys/arch/powerpc/conf/GENERIC @@ -1,72 +1,113 @@ # -# First try for PPC GENERIC config file +# PPC GENERIC config file # machine powerpc maxusers 32 -# Standard system options (should go into std.powerpc?) -options SWAPPAGER, VNODEPAGER, DEVPAGER -options MACHINE_NONCONTIG -options EXEC_ELF -options EXEC_SCRIPT - -# various hacks due to bugs in Openfirmware implementation -options FIREPOWERBUGS - -#options IPKDBUSERHACK -#makeoptions DEBUG="-g" - -#options DDB -#options KTRACE -#options SYSCALL_DEBUG -options TCP_COMPAT_42 -options COMPAT_43 -options COMPAT_09 -options COMPAT_10 -options COMPAT_12 - -options FFS -options MFS - -options NFSCLIENT -options NFSSERVER - -options CD9660 -options MSDOSFS -options FDESC -options FIFO -options KERNFS -options NULLFS -options PORTAL -options PROCFS -options UMAPFS -options UNION - -options INET -options NMBCLUSTERS=1024 - -options MAXUSERS=20 -#options TARGET_ELF +# 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 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 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 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 NS # XNS +#option IPX # IPX+SPX +#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 TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP +#option MULTICAST # Multicast support +#option MROUTING # Multicast routing support + config bsd swap generic -ofroot* at root +# +# Now the Machine specification +# +mainbus0 at root +cpu* at mainbus0 + +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? +ncr* at pci? dev ? function ? +scsibus* at ncr? +de* at pci? dev ? function ? +#vme* at pci? dev ? function ? -ofbus* at openfirm? -ofdisk* at openfirm? +#### 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 ? -ofnet* at openfirm? -#ipkdbif0 at ofnet? -ofcons* at openfirm? +#### PSEUDO Devices -ofrtc* at openfirm? +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 tun 2 # network tunneling over tty -pseudo-device loop -pseudo-device pty 64 -pseudo-device random 1 -pseudo-device rd -pseudo-device vnd 1 +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/MINI b/sys/arch/powerpc/conf/MINI deleted file mode 100644 index df0b6c1141a..00000000000 --- a/sys/arch/powerpc/conf/MINI +++ /dev/null @@ -1,76 +0,0 @@ -# -# First try for PPC GENERIC config file -# - -machine powerpc - -maxusers 32 - -# Standard system options (should go into std.powerpc?) -options SWAPPAGER, VNODEPAGER, DEVPAGER -options MACHINE_NONCONTIG -options EXEC_ELF -options EXEC_SCRIPT - -# various hacks due to bugs in Openfirmware implementation -options FIREPOWERBUGS - -#options IPKDBUSERHACK -#makeoptions DEBUG="-g" - -#options DDB -#options KTRACE -#options SYSCALL_DEBUG -options TCP_COMPAT_42 -options COMPAT_43 -options COMPAT_09 -options COMPAT_10 -options COMPAT_12 - -options FFS -#options MFS - -#options NFSCLIENT -#options NFSSERVER - -options CD9660 -options MSDOSFS -options FDESC -options FIFO -options KERNFS -options NULLFS -#options PORTAL -#options PROCFS -#options UMAPFS -#options UNION - -options INET -options NMBCLUSTERS=1024 - -options MAXUSERS=20 -#options TARGET_ELF - -# needed for rd miniroot support -options MINIROOTSIZE=4096 -options RAMDISK_HOOKS - - -config bsd swap on ofdisk0 and ofdisk1 and ofdisk2 root rd0a - -ofroot* at root - -ofbus* at openfirm? - -ofdisk* at openfirm? - -ofnet* at openfirm? -#ipkdbif0 at ofnet? - -ofcons* at openfirm? - -ofrtc* at openfirm? - -pseudo-device loop -pseudo-device pty 64 -pseudo-device random 1 -pseudo-device rd diff --git a/sys/arch/powerpc/conf/Makefile.powerpc b/sys/arch/powerpc/conf/Makefile.powerpc index 4e4bb94a878..1b45426dbfa 100644 --- a/sys/arch/powerpc/conf/Makefile.powerpc +++ b/sys/arch/powerpc/conf/Makefile.powerpc @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.powerpc,v 1.1 1996/09/30 16:34:18 ws Exp $ +# $OpenBSD: Makefile.powerpc,v 1.5 1997/10/13 09:39:32 pefo Exp $ # -# Makefile for NetBSD +# Makefile for OpenBSD PowerPC # # This makefile is constructed from a machine description: # config machineid @@ -38,7 +38,7 @@ PPC= $S/arch/powerpc INCLUDES= -I. -I$S/arch -I$S -nostdinc -L${DESTDIR}/usr/include CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL \ - -Dpowerpc + -Dpowerpc -Dpower4e CWARNFLAGS= -Werror -Wreturn-type CFLAGS= ${DEBUG} ${CWARNFLAGS} -O2 -msoft-float AFLAGS= -D_LOCORE @@ -136,7 +136,8 @@ clean:: lint: @lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} -UKGDB \ - ${CFILES} ${PPC}/powerpc/swapgeneric.c ioconf.c param.c | \ + ${PPC}/powerpc/Locore.c ${CFILES} ${PPC}/powerpc/swapgeneric.c \ + ioconf.c param.c | \ grep -v 'static function .* unused' tags: diff --git a/sys/arch/powerpc/conf/NFS b/sys/arch/powerpc/conf/NFS deleted file mode 100644 index a24dfae2d68..00000000000 --- a/sys/arch/powerpc/conf/NFS +++ /dev/null @@ -1,69 +0,0 @@ -# -# First try for PPC GENERIC config file -# - -machine powerpc - -maxusers 32 - -# Standard system options (should go into std.powerpc?) -options SWAPPAGER, VNODEPAGER, DEVPAGER -options MACHINE_NONCONTIG -options EXEC_ELF -options EXEC_SCRIPT - -# various hacks due to bugs in Openfirmware implementation -options FIREPOWERBUGS - -#options IPKDBUSERHACK -#makeoptions DEBUG="-g" - -options KTRACE -options SYSCALL_DEBUG -options TCP_COMPAT_42 -options COMPAT_43 -options COMPAT_09 -options COMPAT_10 -options COMPAT_12 - -options FFS -options MFS - -options NFSCLIENT -#options NFSSERVER - -options CD9660 -options MSDOSFS -options FDESC -options FIFO -options KERNFS -options NULLFS -options PORTAL -options PROCFS -options UMAPFS -options UNION - -options INET -options NMBCLUSTERS=1024 - -options MAXUSERS=20 -options TARGET_ELF - -config bsd swap generic - -ofroot* at root - -ofbus* at openfirm? - -ofdisk* at openfirm? - -ofnet* at openfirm? -#ipkdbif0 at ofnet? - -ofcons* at openfirm? - -ofrtc* at openfirm? - -pseudo-device loop -pseudo-device pty 64 -pseudo-device random 1 diff --git a/sys/arch/powerpc/conf/TST b/sys/arch/powerpc/conf/TST deleted file mode 100644 index 0db61f0b1ee..00000000000 --- a/sys/arch/powerpc/conf/TST +++ /dev/null @@ -1,67 +0,0 @@ -# -# First try for PPC GENERIC config file -# - -machine powerpc - -maxusers 32 - -# Standard system options (should go into std.powerpc?) -options SWAPPAGER, VNODEPAGER, DEVPAGER -options MACHINE_NONCONTIG -options EXEC_ELF -options EXEC_SCRIPT - -# various hacks due to bugs in Openfirmware implementation -options FIREPOWERBUGS - -#options IPKDBUSERHACK -#makeoptions DEBUG="-g" - -options TCP_COMPAT_42 -options COMPAT_43 -options COMPAT_09 -options COMPAT_10 -options COMPAT_12 - -options FFS -options MFS - -#options NFSCLIENT -#options NFSSERVER - -options CD9660 -options MSDOSFS -options FDESC -options FIFO -options KERNFS -options NULLFS -options PORTAL -options PROCFS -options UMAPFS -options UNION - -options INET -options NMBCLUSTERS=1024 - -options MAXUSERS=20 -options TARGET_ELF - -config bsd swap generic - -ofroot* at root - -ofbus* at openfirm? - -ofdisk* at openfirm? - -#ofnet* at openfirm? -#ipkdbif0 at ofnet? - -ofcons* at openfirm? - -ofrtc* at openfirm? - -pseudo-device loop -pseudo-device pty 64 -pseudo-device random 1 diff --git a/sys/arch/powerpc/conf/TST.net b/sys/arch/powerpc/conf/TST.net deleted file mode 100644 index 31b09a7f273..00000000000 --- a/sys/arch/powerpc/conf/TST.net +++ /dev/null @@ -1,67 +0,0 @@ -# -# First try for PPC GENERIC config file -# - -machine powerpc - -maxusers 32 - -# Standard system options (should go into std.powerpc?) -options SWAPPAGER, VNODEPAGER, DEVPAGER -options MACHINE_NONCONTIG -options EXEC_ELF -options EXEC_SCRIPT - -# various hacks due to bugs in Openfirmware implementation -options FIREPOWERBUGS - -#options IPKDBUSERHACK -#makeoptions DEBUG="-g" - -options TCP_COMPAT_42 -options COMPAT_43 -options COMPAT_09 -options COMPAT_10 -options COMPAT_12 - -options FFS -options MFS - -#options NFSCLIENT -#options NFSSERVER - -options CD9660 -options MSDOSFS -options FDESC -options FIFO -options KERNFS -options NULLFS -options PORTAL -options PROCFS -options UMAPFS -options UNION - -options INET -options NMBCLUSTERS=1024 - -options MAXUSERS=20 -options TARGET_ELF - -config netbsd swap generic - -ofroot* at root - -ofbus* at openfirm? - -ofdisk* at openfirm? - -ofnet* at openfirm? -#ipkdbif0 at ofnet? - -ofcons* at openfirm? - -ofrtc* at openfirm? - -pseudo-device loop -pseudo-device pty 64 -pseudo-device random 1 diff --git a/sys/arch/powerpc/conf/TST1 b/sys/arch/powerpc/conf/TST1 deleted file mode 100644 index b3ebf9cb730..00000000000 --- a/sys/arch/powerpc/conf/TST1 +++ /dev/null @@ -1,69 +0,0 @@ -# -# First try for PPC GENERIC config file -# - -machine powerpc - -maxusers 32 - -# Standard system options (should go into std.powerpc?) -options SWAPPAGER, VNODEPAGER, DEVPAGER -options MACHINE_NONCONTIG -options EXEC_ELF -options EXEC_SCRIPT - -# various hacks due to bugs in Openfirmware implementation -options FIREPOWERBUGS - -#options IPKDBUSERHACK -#makeoptions DEBUG="-g" - -options KTRACE -options SYSCALL_DEBUG -options TCP_COMPAT_42 -options COMPAT_43 -options COMPAT_09 -options COMPAT_10 -options COMPAT_12 - -options FFS -options MFS - -#options NFSCLIENT -#options NFSSERVER - -options CD9660 -options MSDOSFS -options FDESC -options FIFO -options KERNFS -options NULLFS -options PORTAL -options PROCFS -options UMAPFS -options UNION - -options INET -options NMBCLUSTERS=1024 - -options MAXUSERS=20 -options TARGET_ELF - -config bsd swap generic - -ofroot* at root - -ofbus* at openfirm? - -ofdisk* at openfirm? - -ofnet* at openfirm? -#ipkdbif0 at ofnet? - -ofcons* at openfirm? - -ofrtc* at openfirm? - -pseudo-device loop -pseudo-device pty 64 -pseudo-device random 1 diff --git a/sys/arch/powerpc/conf/TSTdbg b/sys/arch/powerpc/conf/TSTdbg deleted file mode 100644 index c0485cd16c9..00000000000 --- a/sys/arch/powerpc/conf/TSTdbg +++ /dev/null @@ -1,69 +0,0 @@ -# -# First try for PPC GENERIC config file -# - -machine powerpc - -maxusers 32 - -# Standard system options (should go into std.powerpc?) -options SWAPPAGER, VNODEPAGER, DEVPAGER -options MACHINE_NONCONTIG -options EXEC_ELF -options EXEC_SCRIPT - -# various hacks due to bugs in Openfirmware implementation -options FIREPOWERBUGS - -#options IPKDBUSERHACK -#makeoptions DEBUG="-g" - -options TCP_COMPAT_42 -options COMPAT_43 -options COMPAT_09 -options COMPAT_10 -options COMPAT_12 - -options FFS -options MFS - -#options NFSCLIENT -#options NFSSERVER - -options SYSCALL_DEBUG - -options CD9660 -options MSDOSFS -options FDESC -options FIFO -options KERNFS -options NULLFS -options PORTAL -options PROCFS -options UMAPFS -options UNION - -options INET -options NMBCLUSTERS=1024 - -options MAXUSERS=20 -options TARGET_ELF - -config bsd swap generic - -ofroot* at root - -ofbus* at openfirm? - -ofdisk* at openfirm? - -#ofnet* at openfirm? -#ipkdbif0 at ofnet? - -ofcons* at openfirm? - -ofrtc* at openfirm? - -pseudo-device loop -pseudo-device pty 64 -pseudo-device random 1 diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc index 3de19114146..f52056c5a9b 100644 --- a/sys/arch/powerpc/conf/files.powerpc +++ b/sys/arch/powerpc/conf/files.powerpc @@ -1,15 +1,13 @@ # -# First try for powerpc-specific configuration info +# V.I. powerpc-specific configuration info # maxpartitions 16 maxusers 2 8 64 -# -# Openfirmware support -# -include "../../../dev/ofw/files.ofw" -major {ofdisk = 0} +# need some decl. from here... +include "../../../dev/atapi/files.atapi" +major { acd = 5 } file arch/powerpc/powerpc/Locore.c file arch/powerpc/powerpc/autoconf.c @@ -45,20 +43,34 @@ file arch/powerpc/powerpc/db_disasm.c ddb file arch/powerpc/powerpc/db_interface.c ddb file arch/powerpc/powerpc/db_trace.c ddb -pseudo-device rd -file dev/ramdisk.c rd needs-flag -file arch/powerpc/powerpc/rd_root.c ramdisk_hooks -major {rd = 17} +file arch/powerpc/powerpc/ofwreal.S -# FirePower specific code -#device firepower: openfirm -#attach firepower at root +define mainbus {} +device mainbus +attach mainbus at root +file arch/powerpc/powerpc/mainbus.c mainbus -#file arch/powerpc/firepower/firedep.c firepower needs-flag -#file arch/powerpc/firepower/fireirq.c firepower +device cpu +attach cpu at mainbus +file arch/powerpc/powerpc/cpu.c + +pseudo-device rd +file dev/ramdisk.c rd needs-flag +file arch/powerpc/powerpc/rd_root.c ramdisk_hooks +major {rd = 17} -# FirePower OpenFirmware Bug Workarounds -file arch/powerpc/powerpc/ofwreal.S firepowerbugs +device mpcpcibr {} : pcibus +attach mpcpcibr at mainbus +file arch/powerpc/pci/mpcpcibus.c +device isabr {} : isabus +attach isabr at mainbus +file arch/powerpc/isa/isabus.c isabr include "../../../scsi/files.scsi" +major {sd = 0} +major {cd = 3} +define pcmcia {} # XXX dummy decl... +include "../../../dev/pci/files.pci" +include "../../../dev/isa/files.isa" +major { wd = 4 } |