From fe764c24155924653fdb5b0ed950b7b7c3bdefb7 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 6 Jan 1997 03:39:13 +0000 Subject: [PATCH] Added the ipl pseudo device. Cleaned up the options and sync with reality. --- sys/arch/arm32/conf/A7000 | 30 ++++++++++++++++-------------- sys/arch/arm32/conf/GENERIC | 16 +++++++++------- sys/arch/arm32/conf/PHARM | 35 +++++++++++++++++++---------------- sys/arch/arm32/conf/RC7500 | 17 ++++++++++------- sys/arch/arm32/conf/REMY | 33 ++++++++++++++++++--------------- sys/arch/arm32/conf/SA110 | 18 ++++++++++-------- sys/arch/arm32/conf/VOYAGER | 24 +++++++++++++----------- 7 files changed, 95 insertions(+), 78 deletions(-) diff --git a/sys/arch/arm32/conf/A7000 b/sys/arch/arm32/conf/A7000 index e1275cabe8fc..0a4e400935ba 100644 --- a/sys/arch/arm32/conf/A7000 +++ b/sys/arch/arm32/conf/A7000 @@ -24,7 +24,7 @@ options CPU_LATE_ABORT # ARM7XX compatibility # FPA options -#options FPE # Single precision FPE +#options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE # File system options @@ -32,7 +32,7 @@ options ARMFPE # ARM Ltd FPE options FFS # UFS #options QUOTA # UFS quotas #options LFS # log-structured file system -#options MFS # memory file system +#options MFS # memory file system options CD9660 # ISO 9660 + Rock Ridge file system options MSDOSFS # MS-DOS file system @@ -76,20 +76,21 @@ options SHMMAXPGS=1024 # 1024 pages is the default options MEMORY_DISK_HOOKS # boottime setup of ramdisk options MEMORY_DISK_SIZE=0 # Size in KBytes -#options PLIP # Build plip device into lpt driver +#options PLIP # Build plip device into lpt driver # Miscellaneous options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules +#options LKM # loadable kernel modules # Development and Debugging options options MOUSE_IOC_ACK # acknowledge state change ioctls #options ARM700BUGTRACK # track the ARM700 swi bug -#options HYDRA # Experimental hydra support -#options MPSUPPORT # Experimental MP support -#options PORTMASTER # Enable PortMaster only options +#options HYDRA # Experimental hydra support +#options MPSUPPORT # Experimental MP support +#options PORTMASTER # Enable PortMaster only options +options PROFILE_ASM # when profiling, profile asm functions options DIAGNOSTIC # internally consistency checks options POSTMORTEM # perform postmortem on panic #options ROTTEN_INNARDS # show the gory bit of the postmortem @@ -165,19 +166,19 @@ rtc0 at iic? addr 0xa0 # Podule bus device podulebus0 at root -asc0 at podulebus? # Acorn SCSI card +asc* at podulebus? # Acorn SCSI card scsibus* at asc? -cosc0 at podulebus? # MCS Connect32 SCSI II card +cosc* at podulebus? # MCS Connect32 SCSI II card scsibus* at cosc? -#csc0 at podulebus? # Cumana SCSI II card +#csc* at podulebus? # Cumana SCSI II card #scsibus* at csc? -ptsc0 at podulebus? # Power-Tec SCSI II card +ptsc* at podulebus? # Power-Tec SCSI II card scsibus* at ptsc? -oak0 at podulebus? # Oak SCSI I card +oak* at podulebus? # Oak SCSI I card scsibus* at oak? sd* at scsibus? target ? lun ? # SCSI disk drives @@ -189,16 +190,17 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives #kie* at podulebus? slot ? offset ? -ea0 at podulebus? # Ether3 podules +ea* at podulebus? # Ether3 podules eb0 at podulebus? # EtherB network slot cards eh0 at podulebus? # EtherH network slot cards -ie0 at podulebus? # Ether1 podules +ie* at podulebus? # Ether1 podules pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP pseudo-device tun 2 # network tunneling over tty +#pseudo-device ipl 1 # ip filter pseudo-device pty 32 # pseudo-terminals pseudo-device tb 1 # tablet line discipline diff --git a/sys/arch/arm32/conf/GENERIC b/sys/arch/arm32/conf/GENERIC index 838c416ec9ab..c581e4cbdc80 100644 --- a/sys/arch/arm32/conf/GENERIC +++ b/sys/arch/arm32/conf/GENERIC @@ -102,6 +102,7 @@ options MOUSE_IOC_ACK # acknowledge state change ioctls #options HYDRA # Experimental hydra support #options MPSUPPORT # Experimental MP support #options PORTMASTER # Enable PortMaster only options +options PROFILE_ASM # when profiling, profile asm functions options DIAGNOSTIC # internally consistency checks options POSTMORTEM # perform postmortem on panic #options ROTTEN_INNARDS # show the gory bit of the postmortem @@ -177,19 +178,19 @@ rtc0 at iic? addr 0xa0 # Podule bus device podulebus0 at root -asc0 at podulebus? # Acorn SCSI card +asc* at podulebus? # Acorn SCSI card scsibus* at asc? -cosc0 at podulebus? # MCS Connect32 SCSI II card +cosc* at podulebus? # MCS Connect32 SCSI II card scsibus* at cosc? -#csc0 at podulebus? # Cumana SCSI II card +#csc* at podulebus? # Cumana SCSI II card #scsibus* at csc? -ptsc0 at podulebus? # Power-Tec SCSI II card +ptsc* at podulebus? # Power-Tec SCSI II card scsibus* at ptsc? -oak0 at podulebus? # Oak SCSI I card +oak* at podulebus? # Oak SCSI I card scsibus* at oak? sd* at scsibus? target ? lun ? # SCSI disk drives @@ -201,16 +202,17 @@ ss* at scsibus? target ? lun ? # SCSI scanner #kie* at podulebus? slot ? offset ? -ea0 at podulebus? # Ether3 podules +ea* at podulebus? # Ether3 podules eb0 at podulebus? # EtherB network slot cards eh0 at podulebus? # EtherH network slot cards -ie0 at podulebus? # Ether1 podules +ie* at podulebus? # Ether1 podules pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP pseudo-device tun 2 # network tunneling over tty +#pseudo-device ipl 1 # ip filter pseudo-device pty 32 # pseudo-terminals pseudo-device tb 1 # tablet line discipline diff --git a/sys/arch/arm32/conf/PHARM b/sys/arch/arm32/conf/PHARM index b42a8e388855..b2b53a7fa8fc 100644 --- a/sys/arch/arm32/conf/PHARM +++ b/sys/arch/arm32/conf/PHARM @@ -29,8 +29,8 @@ options ARMFPE # ARM Ltd FPE # File system options options FFS # UFS -#options QUOTA # UFS quotas -#options LFS # log-structured file system +#options QUOTA # UFS quotas +#options LFS # log-structured file system options MFS # memory file system options CD9660 # ISO 9660 + Rock Ridge file system @@ -38,8 +38,8 @@ options MSDOSFS # MS-DOS file system options FDESC # /dev/fd options FIFO # FIFOs; RECOMMENDED options KERNFS # /kern -#options NULLFS # loopback file system -#options PORTAL # portal filesystem (still experimental) +#options NULLFS # loopback file system +#options PORTAL # portal filesystem (still experimental) options PROCFS # /proc options UMAPFS # NULLFS + uid and gid remapping options UNION # union file system @@ -50,10 +50,10 @@ options NFSCLIENT options NFSSERVER options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP -#options NS # XNS -#options ISO,TPIP # OSI -#options EON # OSI tunneling over IP -#options CCITT,LLC,HDLC # X.25 +#options NS # XNS +#options ISO,TPIP # OSI +#options EON # OSI tunneling over IP +#options CCITT,LLC,HDLC # X.25 # Compatibility options @@ -79,11 +79,13 @@ options PLIP # Build plip device into lpt driver # Development options +options MOUSE_IOC_ACK # acknowledge state change ioctls options DIAGNOSTIC # internally consistency checks +options PROFILE_ASM # when profiling, profile asm functions options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # IRQ statistics options POSTMORTEM # perform postmortem on panic -#options ROTTEN_INNARDS # show the gory bit of the postmortem +#options ROTTEN_INNARDS # show the gory bit of the postmortem options KSHELL # kernel developemnt shell (debug) options LKM # loadable kernel modules #options DEBUGTERM # create a debug console @@ -147,19 +149,19 @@ rtc0 at iic? addr 0xa0 # Podule bus device podulebus0 at root -asc0 at podulebus? # Acorn SCSI card +asc* at podulebus? # Acorn SCSI card scsibus* at asc? -cosc0 at podulebus? # MCS Connect32 SCSI II card +cosc* at podulebus? # MCS Connect32 SCSI II card scsibus* at cosc? -#csc0 at podulebus? # Cumana SCSI II card +#csc* at podulebus? # Cumana SCSI II card #scsibus* at csc? -#ptsc0 at podulebus? # Power-Tec SCSI II card +#ptsc* at podulebus? # Power-Tec SCSI II card #scsibus* at ptsc? -#oak0 at podulebus? # Oak SCSI I card +#oak* at podulebus? # Oak SCSI I card #scsibus* at oak? sd* at scsibus? target ? lun ? # SCSI disk drives @@ -170,16 +172,17 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives #kie* at podulebus? slot ? offset ? -#ea0 at podulebus? # Ether3 podules +#ea* at podulebus? # Ether3 podules eb0 at podulebus? # EtherB network slot cards #eh0 at podulebus? # EtherH network slot cards -#ie0 at podulebus? # Ether1 podules +#ie* at podulebus? # Ether1 podules pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP pseudo-device tun 2 # network tunneling over tty +#pseudo-device ipl 1 # ip filter pseudo-device pty 32 # pseudo-terminals pseudo-device tb 1 # tablet line discipline diff --git a/sys/arch/arm32/conf/RC7500 b/sys/arch/arm32/conf/RC7500 index 8aacc0e02933..fc912eb07c91 100644 --- a/sys/arch/arm32/conf/RC7500 +++ b/sys/arch/arm32/conf/RC7500 @@ -26,7 +26,7 @@ options CPU_LATE_ABORT # ARM7XX compatibility # FPA options -#options FPE # Single precision FPE +#options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE # File system options @@ -82,7 +82,9 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Development options +options MOUSE_IOC_ACK # acknowledge state change ioctls #options DIAGNOSTIC # internally consistency checks +options PROFILE_ASM # when profiling, profile asm functions options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # IRQ statistics options POSTMORTEM # perform postmortem on panic @@ -162,16 +164,16 @@ rtc0 at iic? addr 0xa0 # Podule bus device #podulebus0 at root -#asc0 at podulebus? # Acorn SCSI card +#asc* at podulebus? # Acorn SCSI card #scsibus* at asc? -#csc0 at podulebus? # Cumana SCSI II card +#csc* at podulebus? # Cumana SCSI II card #scsibus* at csc? -#ptsc0 at podulebus? # Power-Tec SCSI II card +#ptsc* at podulebus? # Power-Tec SCSI II card #scsibus* at ptsc? -#oak0 at podulebus? # Oak SCSI I card +#oak* at podulebus? # Oak SCSI I card #scsibus* at oak? #sd* at scsibus? target ? lun ? # SCSI disk drives @@ -183,10 +185,10 @@ rtc0 at iic? addr 0xa0 #kie* at podulebus? slot ? offset ? -#eb0 at podulebus? # EtherB network slot cards +#eb* at podulebus? # EtherB network slot cards #ea0 at podulebus? # Ether3 podules #eh0 at podulebus? # EtherH network slot cards -#ie0 at podulebus? # Ether1 podules +#ie* at podulebus? # Ether1 podules es0 at mainbus? base 0x0022B800 irq 11 # On board SMC 91C92 ethernet controller @@ -195,6 +197,7 @@ pseudo-device bpfilter 8 # packet filter #pseudo-device sl 2 # CSLIP #pseudo-device ppp 2 # PPP pseudo-device tun 2 # network tunneling over tty +#pseudo-device ipl 1 # ip filter pseudo-device pty 32 # pseudo-terminals pseudo-device tb 1 # tablet line discipline diff --git a/sys/arch/arm32/conf/REMY b/sys/arch/arm32/conf/REMY index dec33cb255b7..52beb66bd504 100644 --- a/sys/arch/arm32/conf/REMY +++ b/sys/arch/arm32/conf/REMY @@ -23,37 +23,37 @@ options CPU_LATE_ABORT # ARM7XX compatibility # FPA options -#options FPE # Single precision FPE +#options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE # File system options options FFS # UFS -#options QUOTA # UFS quotas -#options LFS # log-structured file system -#options MFS # memory file system +#options QUOTA # UFS quotas +#options LFS # log-structured file system +#options MFS # memory file system options CD9660 # ISO 9660 + Rock Ridge file system options MSDOSFS # MS-DOS file system options FDESC # /dev/fd options FIFO # FIFOs; RECOMMENDED options KERNFS # /kern -#options NULLFS # loopback file system -#options PORTAL # portal filesystem (still experimental) +#options NULLFS # loopback file system +#options PORTAL # portal filesystem (still experimental) options PROCFS # /proc -#options UMAPFS # NULLFS + uid and gid remapping +#options UMAPFS # NULLFS + uid and gid remapping options UNION # union file system # Networking options options NFSCLIENT options NFSSERVER -#options GATEWAY # packet forwarding +#options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP -#options NS # XNS -#options ISO,TPIP # OSI -#options EON # OSI tunneling over IP -#options CCITT,LLC,HDLC # X.25 +#options NS # XNS +#options ISO,TPIP # OSI +#options EON # OSI tunneling over IP +#options CCITT,LLC,HDLC # X.25 # Compatibility options @@ -79,11 +79,13 @@ options PLIP # Build plip device into lpt driver # Development options +options MOUSE_IOC_ACK # acknowledge state change ioctls options DIAGNOSTIC # internally consistency checks +options PROFILE_ASM # when profiling, profile asm functions options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # IRQ statistics options POSTMORTEM # perform postmortem on panic -#options ROTTEN_INNARDS # show the gory bit of the postmortem +#options ROTTEN_INNARDS # show the gory bit of the postmortem options KSHELL # kernel developemnt shell (debug) options LKM # loadable kernel modules #options DEBUGTERM # create a debug console @@ -319,16 +321,17 @@ ch* at scsibus? target ? lun ? # SCSI auto-changers #kie* at podulebus? slot ? offset ? -#ea0 at podulebus? # Ether3 podules +#ea* at podulebus? # Ether3 podules #eb0 at podulebus? # EtherB network slot cards #eh0 at podulebus? # EtherH network slot cards -#ie0 at podulebus? # Ether1 podules +#ie* at podulebus? # Ether1 podules pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP pseudo-device tun 2 # network tunneling over tty +#pseudo-device ipl 1 # ip filter pseudo-device pty 32 # pseudo-terminals pseudo-device tb 1 # tablet line discipline diff --git a/sys/arch/arm32/conf/SA110 b/sys/arch/arm32/conf/SA110 index 35021da885ba..6d8721c8ca06 100644 --- a/sys/arch/arm32/conf/SA110 +++ b/sys/arch/arm32/conf/SA110 @@ -22,7 +22,7 @@ options CPU_SA110 # Support the SA110 core # FPA options -#options FPE # Single precision FPE +#options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE # File system options @@ -87,6 +87,7 @@ options MOUSE_IOC_ACK # acknowledge state change ioctls #options ARM700BUGTRACK # track the ARM700 swi bug options HYDRA # Experimental hydra support options MPSUPPORT # Experimental MP support +options PROFILE_ASM # when profiling, profile asm functions options PORTMASTER # Enable PortMaster only options options DIAGNOSTIC # internally consistency checks options POSTMORTEM # perform postmortem on panic @@ -170,19 +171,19 @@ rtc0 at iic? addr 0xa0 # Podule bus device podulebus0 at root -asc0 at podulebus? # Acorn SCSI card +asc* at podulebus? # Acorn SCSI card scsibus* at asc? -cosc0 at podulebus? # MCS Connect32 SCSI II card +cosc* at podulebus? # MCS Connect32 SCSI II card scsibus* at cosc? -#csc0 at podulebus? # Cumana SCSI II card +#csc* at podulebus? # Cumana SCSI II card #scsibus* at csc? -ptsc0 at podulebus? # Power-Tec SCSI II card +ptsc* at podulebus? # Power-Tec SCSI II card scsibus* at ptsc? -oak0 at podulebus? # Oak SCSI I card +oak* at podulebus? # Oak SCSI I card scsibus* at oak? sd* at scsibus? target ? lun ? # SCSI disk drives @@ -194,16 +195,17 @@ ss* at scsibus? target ? lun ? # SCSI scanner #kie* at podulebus? slot ? offset ? -ea0 at podulebus? # Ether3 podules +ea* at podulebus? # Ether3 podules eb0 at podulebus? # EtherB network slot cards eh0 at podulebus? # EtherH network slot cards -ie0 at podulebus? # Ether1 podules +ie* at podulebus? # Ether1 podules pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP pseudo-device tun 2 # network tunneling over tty +#pseudo-device ipl 1 # ip filter pseudo-device pty 32 # pseudo-terminals pseudo-device tb 1 # tablet line discipline diff --git a/sys/arch/arm32/conf/VOYAGER b/sys/arch/arm32/conf/VOYAGER index be8172664135..dd21b4c75435 100644 --- a/sys/arch/arm32/conf/VOYAGER +++ b/sys/arch/arm32/conf/VOYAGER @@ -24,7 +24,7 @@ options CPU_LATE_ABORT # ARM7XX compatibility # FPA options -#options FPE # Single precision FPE +#options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE # File system options @@ -88,9 +88,10 @@ options LKM # loadable kernel modules options MOUSE_IOC_ACK # acknowledge state change ioctls #options ARM700BUGTRACK # track the ARM700 swi bug -options HYDRA # Experimental hydra support -options MPSUPPORT # Experimental MP support -options PORTMASTER # Enable PortMaster only options +#options HYDRA # Experimental hydra support +#options MPSUPPORT # Experimental MP support +#options PORTMASTER # Enable PortMaster only options +options PROFILE_ASM # when profiling, profile asm functions options DIAGNOSTIC # internally consistency checks options POSTMORTEM # perform postmortem on panic #options ROTTEN_INNARDS # show the gory bit of the postmortem @@ -174,19 +175,19 @@ rtc0 at iic? addr 0xa0 # Podule bus device podulebus0 at root -asc0 at podulebus? # Acorn SCSI card +asc* at podulebus? # Acorn SCSI card scsibus* at asc? -cosc0 at podulebus? # MCS Connect32 SCSI II card +cosc* at podulebus? # MCS Connect32 SCSI II card scsibus* at cosc? -#csc0 at podulebus? # Cumana SCSI II card +#csc* at podulebus? # Cumana SCSI II card #scsibus* at csc? -ptsc0 at podulebus? # Power-Tec SCSI II card +ptsc* at podulebus? # Power-Tec SCSI II card scsibus* at ptsc? -oak0 at podulebus? # Oak SCSI I card +oak* at podulebus? # Oak SCSI I card scsibus* at oak? sd* at scsibus? target ? lun ? # SCSI disk drives @@ -198,16 +199,17 @@ ss* at scsibus? target ? lun ? # SCSI scanner #kie* at podulebus? slot ? offset ? -ea0 at podulebus? # Ether3 podules +ea* at podulebus? # Ether3 podules eb0 at podulebus? # EtherB network slot cards eh0 at podulebus? # EtherH network slot cards -ie0 at podulebus? # Ether1 podules +ie* at podulebus? # Ether1 podules pseudo-device loop 1 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP pseudo-device tun 2 # network tunneling over tty +#pseudo-device ipl 1 # ip filter pseudo-device pty 32 # pseudo-terminals pseudo-device tb 1 # tablet line discipline