From 41a9e723e38c79cfeee9b94b629db8392c929f59 Mon Sep 17 00:00:00 2001 From: thorpej Date: Fri, 31 Jan 1997 05:46:09 +0000 Subject: [PATCH] Adopt for new file system and root spec grammar. --- sys/arch/arm32/conf/A7000 | 39 +++++++++++++++++++------------------ sys/arch/arm32/conf/GENERIC | 37 ++++++++++++++++++----------------- sys/arch/arm32/conf/PHARM | 35 +++++++++++++++++---------------- sys/arch/arm32/conf/RC7500 | 35 +++++++++++++++++---------------- sys/arch/arm32/conf/REMY | 37 ++++++++++++++++++----------------- sys/arch/arm32/conf/SA110 | 37 ++++++++++++++++++----------------- sys/arch/arm32/conf/VOYAGER | 39 +++++++++++++++++++------------------ sys/arch/atari/conf/ATARITT | 3 +-- sys/arch/atari/conf/BOOT | 3 +-- sys/arch/atari/conf/BOOTX | 3 +-- sys/arch/atari/conf/FALCON | 3 +-- sys/arch/atari/conf/GENERIC | 13 ++++--------- sys/arch/atari/conf/HADES | 9 ++------- 13 files changed, 143 insertions(+), 150 deletions(-) diff --git a/sys/arch/arm32/conf/A7000 b/sys/arch/arm32/conf/A7000 index 649d262707d5..4cb4908a835f 100644 --- a/sys/arch/arm32/conf/A7000 +++ b/sys/arch/arm32/conf/A7000 @@ -26,28 +26,30 @@ options CPU_LATE_ABORT # ARM7XX compatibility #options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE +# File systems + +file-system FFS # UFS +#file-system LFS # log-structured file system +#file-system MFS # memory file system +file-system NFS + +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +#file-system NULLFS # loopback file system +#file-system PORTAL # portal filesystem (still experimental) +file-system PROCFS # /proc +file-system UMAPFS # NULLFS + uid and gid remapping +file-system UNION # union file system + # File system options - -options FFS # UFS #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 PROCFS # /proc -options UMAPFS # NULLFS + uid and gid remapping -options UNION # union file system +options NFSSERVER # Networking options -options NFSCLIENT -options NFSSERVER options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP #options NS # XNS @@ -101,9 +103,8 @@ options KSHELL # kernel developemnt shell (debug) options DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table -#config netbsd root on nfs swap on nfs -config netbsd swap generic -options GENERIC +#config netbsd root on ? type nfs +config netbsd root on ? type ? # The main bus device mainbus0 at root diff --git a/sys/arch/arm32/conf/GENERIC b/sys/arch/arm32/conf/GENERIC index e19448828e6c..601848cc9cbe 100644 --- a/sys/arch/arm32/conf/GENERIC +++ b/sys/arch/arm32/conf/GENERIC @@ -36,28 +36,30 @@ options CPU_LATE_ABORT # ARM7XX compatibility #options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE +# File systems + +file-system FFS # UFS +file-system LFS # log-structured file system +file-system MFS # memory file system +file-system NFS + +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +file-system NULLFS # loopback file system +file-system PORTAL # portal filesystem (still experimental) +file-system PROCFS # /proc +file-system UMAPFS # NULLFS + uid and gid remapping +file-system UNION # union file system + # File system options - -options FFS # UFS 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 PROCFS # /proc -options UMAPFS # NULLFS + uid and gid remapping -options UNION # union file system +options NFSSERVER # Networking options -options NFSCLIENT -options NFSSERVER options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP #options MROUTING # IP multicast routing @@ -115,8 +117,7 @@ options KSHELL # kernel developemnt shell (debug) options DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table -config netbsd swap generic -options GENERIC +config netbsd root on ? type ? #options COMCONSOLE=0,CONADDR=0x3f8,CONUNIT=0,CONSPEED=9600 # The main bus device diff --git a/sys/arch/arm32/conf/PHARM b/sys/arch/arm32/conf/PHARM index 3bc41922dc7c..3dfe1e02a63d 100644 --- a/sys/arch/arm32/conf/PHARM +++ b/sys/arch/arm32/conf/PHARM @@ -25,28 +25,30 @@ options CPU_LATE_ABORT # ARM7XX compatibility #options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE +# File systems + +file-system FFS # UFS +#file-system LFS # log-structured file system +file-system MFS # memory file system + +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +#file-system NULLFS # loopback file system +#file-system PORTAL # portal filesystem (still experimental) +file-system PROCFS # /proc +file-system UMAPFS # NULLFS + uid and gid remapping +file-system UNION # union file system + # File system options - -options FFS # UFS #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 PROCFS # /proc -options UMAPFS # NULLFS + uid and gid remapping -options UNION # union file system +options NFSSERVER # Networking options options NFSCLIENT -options NFSSERVER options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP #options NS # XNS @@ -92,8 +94,7 @@ options LKM # loadable kernel modules options DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table -config netbsd swap generic -options GENERIC +config netbsd root on ? type ? # The main bus device mainbus0 at root diff --git a/sys/arch/arm32/conf/RC7500 b/sys/arch/arm32/conf/RC7500 index 247765f589db..67f3d62a03cf 100644 --- a/sys/arch/arm32/conf/RC7500 +++ b/sys/arch/arm32/conf/RC7500 @@ -30,26 +30,28 @@ 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 +file-system FFS # UFS +#file-system LFS # log-structured file system +#file-system MFS # memory file system +file-system NFS -options CD9660 # ISO 9660 + Rock Ridge file system -options MSDOSFS # MS-DOS file system -options FDESC # /dev/fd +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +#file-system NULLFS # loopback file system +#file-system PORTAL # ? +file-system PROCFS # /proc +#file-system UMAPFS # NULLFS + uid and gid remapping +#file-system UNION # union file system + +# File system options +#options QUOTA # UFS quotas options FIFO # FIFOs; RECOMMENDED -options KERNFS # /kern -#options NULLFS # loopback file system -#options PORTAL # ? -options PROCFS # /proc -#options UMAPFS # NULLFS + uid and gid remapping -#options UNION # union file system +options NFSSERVER # Networking options -options NFSCLIENT -options NFSSERVER options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP #options NS # XNS @@ -97,8 +99,7 @@ options DDB # in-kernel debugger #options PROM_DEBUG # Used for bootstrap debugging the RC7500 -config netbsd swap generic -options GENERIC +config netbsd root on ? type ? # The main bus device mainbus0 at root diff --git a/sys/arch/arm32/conf/REMY b/sys/arch/arm32/conf/REMY index d00bda86f6e6..6f300445c051 100644 --- a/sys/arch/arm32/conf/REMY +++ b/sys/arch/arm32/conf/REMY @@ -25,28 +25,30 @@ options CPU_LATE_ABORT # ARM7XX compatibility #options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE +# File systems + +file-system FFS # UFS +#file-system LFS # log-structured file system +#file-system MFS # memory file system +file-system NFS + +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +#file-system NULLFS # loopback file system +#file-system PORTAL # portal filesystem (still experimental) +file-system PROCFS # /proc +#file-system UMAPFS # NULLFS + uid and gid remapping +file-system UNION # union file system + # File system options - -options FFS # UFS #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 PROCFS # /proc -#options UMAPFS # NULLFS + uid and gid remapping -options UNION # union file system +options NFSSERVER # Networking options -options NFSCLIENT -options NFSSERVER #options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP #options NS # XNS @@ -92,8 +94,7 @@ options LKM # loadable kernel modules #options DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table -config netbsd swap generic -options GENERIC +config netbsd root on ? type ? # The main bus device mainbus0 at root diff --git a/sys/arch/arm32/conf/SA110 b/sys/arch/arm32/conf/SA110 index e89c59bd1b45..d8ae227f86a4 100644 --- a/sys/arch/arm32/conf/SA110 +++ b/sys/arch/arm32/conf/SA110 @@ -24,28 +24,30 @@ options CPU_SA110 # Support the SA110 core #options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE +# File systems + +file-system FFS # UFS +#file-system LFS # log-structured file system +file-system MFS # memory file system +file-system NFS + +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +#file-system NULLFS # loopback file system +#file-system PORTAL # portal filesystem (still experimental) +file-system PROCFS # /proc +file-system UMAPFS # NULLFS + uid and gid remapping +file-system UNION # union file system + # File system options - -options FFS # UFS #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 PROCFS # /proc -options UMAPFS # NULLFS + uid and gid remapping -options UNION # union file system +options NFSSERVER # Networking options -options NFSCLIENT -options NFSSERVER options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP #options NS # XNS @@ -99,8 +101,7 @@ options KSHELL # kernel developemnt shell (debug) options DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table -config netbsd swap generic -options GENERIC +config netbsd root on ? type ? # The main bus device mainbus0 at root diff --git a/sys/arch/arm32/conf/VOYAGER b/sys/arch/arm32/conf/VOYAGER index afc8f4496f4e..c4f8f2007c7d 100644 --- a/sys/arch/arm32/conf/VOYAGER +++ b/sys/arch/arm32/conf/VOYAGER @@ -26,29 +26,31 @@ options CPU_LATE_ABORT # ARM7XX compatibility #options FPE # Single precision FPE options ARMFPE # ARM Ltd FPE +# File systems + +file-system FFS # UFS +#file-system LFS # log-structured file system +file-system MFS # memory file system +file-system NFS + +file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system MSDOSFS # MS-DOS file system +file-system FDESC # /dev/fd +file-system KERNFS # /kern +#file-system NULLFS # loopback file system +#file-system PORTAL # portal filesystem (still experimental) +file-system PROCFS # /proc +file-system UMAPFS # NULLFS + uid and gid remapping +file-system UNION # union file system +file-system ADFS + # File system options - -options FFS # UFS #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 PROCFS # /proc -options UMAPFS # NULLFS + uid and gid remapping -options UNION # union file system -options ADFS +options NFSSERVER # Networking options -options NFSCLIENT -options NFSSERVER options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP #options NS # XNS @@ -102,8 +104,7 @@ options KSHELL # kernel developemnt shell (debug) options DDB # in-kernel debugger #makeoptions DEBUG="-g" # compile full symbol table -config netbsd swap generic -options GENERIC +config netbsd root on ? type ? # The main bus device mainbus0 at root diff --git a/sys/arch/atari/conf/ATARITT b/sys/arch/atari/conf/ATARITT index 0a8c493a08cd..2fb883a07c0f 100644 --- a/sys/arch/atari/conf/ATARITT +++ b/sys/arch/atari/conf/ATARITT @@ -1,5 +1,5 @@ # -# $NetBSD: ATARITT,v 1.20 1997/01/31 01:48:24 thorpej Exp $ +# $NetBSD: ATARITT,v 1.21 1997/01/31 05:49:59 thorpej Exp $ # # ATARI-TT # @@ -78,7 +78,6 @@ options COMPAT_12 # Compatibility to NetBSD1.2 options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code options "NKMEMCLUSTERS=256" # Size of kernel malloc area -options GENERIC # Mini-root boot support # # Atari specific kernel options: diff --git a/sys/arch/atari/conf/BOOT b/sys/arch/atari/conf/BOOT index 25d882873ea9..178ee348ebbb 100644 --- a/sys/arch/atari/conf/BOOT +++ b/sys/arch/atari/conf/BOOT @@ -1,5 +1,5 @@ # -# $NetBSD: BOOT,v 1.18 1997/01/31 01:48:25 thorpej Exp $ +# $NetBSD: BOOT,v 1.19 1997/01/31 05:50:00 thorpej Exp $ # # BOOT # @@ -67,7 +67,6 @@ options COMPAT_12 # Compatibility to NetBSD1.2 options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code options "NKMEMCLUSTERS=256" # Size of kernel malloc area -options GENERIC # Mini-root boot support # # Atari specific kernel options: diff --git a/sys/arch/atari/conf/BOOTX b/sys/arch/atari/conf/BOOTX index 4b597978437d..555906fad124 100644 --- a/sys/arch/atari/conf/BOOTX +++ b/sys/arch/atari/conf/BOOTX @@ -1,5 +1,5 @@ # -# $NetBSD: BOOTX,v 1.12 1997/01/31 01:48:26 thorpej Exp $ +# $NetBSD: BOOTX,v 1.13 1997/01/31 05:50:01 thorpej Exp $ # # BOOTX # @@ -70,7 +70,6 @@ options COMPAT_12 # Compatibility to NetBSD1.2 options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code options "NKMEMCLUSTERS=256" # Size of kernel malloc area -options GENERIC # Mini-root boot support # # Atari specific kernel options: diff --git a/sys/arch/atari/conf/FALCON b/sys/arch/atari/conf/FALCON index caefacff4593..2b7708d993c5 100644 --- a/sys/arch/atari/conf/FALCON +++ b/sys/arch/atari/conf/FALCON @@ -1,5 +1,5 @@ # -# $NetBSD: FALCON,v 1.18 1997/01/31 01:48:27 thorpej Exp $ +# $NetBSD: FALCON,v 1.19 1997/01/31 05:50:02 thorpej Exp $ # # ATARI-FALCON # @@ -69,7 +69,6 @@ options COMPAT_12 # Compatibility to NetBSD1.2 options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code options "NKMEMCLUSTERS=256" # Size of kernel malloc area -options GENERIC # Mini-root boot support # # Atari specific kernel options: diff --git a/sys/arch/atari/conf/GENERIC b/sys/arch/atari/conf/GENERIC index 2e6467d5b10b..14a4552bef43 100644 --- a/sys/arch/atari/conf/GENERIC +++ b/sys/arch/atari/conf/GENERIC @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.24 1997/01/31 01:48:28 thorpej Exp $ +# $NetBSD: GENERIC,v 1.25 1997/01/31 05:50:04 thorpej Exp $ # # Generic atari # @@ -40,6 +40,7 @@ options INET # Basic networking support # File systems file-system FFS # Berkeley fast file system file-system MFS # Memory based filesystem +file-system NFS # Network File System client side code file-system PROCFS # Process filesystem file-system KERNFS # Kernel parameter filesystem file-system FDESC # /dev/fd @@ -52,6 +53,8 @@ file-system PORTAL # portal file system # File system options options FIFO # FIFO operations on vnodes +options QUOTA # Disk quotas for local disks +options NFSSERVER # Network File System server side code # # Misc. debuging options @@ -59,13 +62,6 @@ options FIFO # FIFO operations on vnodes options PANICWAIT # Require keystroke to dump/reboot options DDB # Kernel debugger -# -# File system related options -# -options QUOTA # Disk quotas for local disks -options NFSSERVER # Network File System server side code -options NFSCLIENT # Network File System client side code - # # Compatability options for various existing systems # @@ -90,7 +86,6 @@ options SYSVSEM # System V semaphores options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code options "NKMEMCLUSTERS=256" # Size of kernel malloc area -options GENERIC # Mini-root boot support # # Atari specific options diff --git a/sys/arch/atari/conf/HADES b/sys/arch/atari/conf/HADES index 95cd23be21e3..e3e02cac345e 100644 --- a/sys/arch/atari/conf/HADES +++ b/sys/arch/atari/conf/HADES @@ -1,5 +1,5 @@ # -# $NetBSD: HADES,v 1.5 1997/01/31 01:48:28 thorpej Exp $ +# $NetBSD: HADES,v 1.6 1997/01/31 05:50:04 thorpej Exp $ # # Medusa-Hades # @@ -31,6 +31,7 @@ options INET # Basic networking support # File systems file-system FFS # Berkeley fast file system file-system MFS # Memory based filesystem +#file-system NFS # Network File System client side code file-system PROCFS # Process filesystem file-system KERNFS # Kernel parameter filesystem file-system NULLFS # Loopback filesystem @@ -47,11 +48,6 @@ options FIFO # FIFO operations on vnodes options PANICWAIT # Require keystroke to dump/reboot options DDB # Kernel debugger -# -# File system related options -# -#options NFSCLIENT # Network File System client side code - # # Compatability options for various existing systems # @@ -73,7 +69,6 @@ options COMPAT_12 # Compatibility to NetBSD1.2 options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code options "NKMEMCLUSTERS=256" # Size of kernel malloc area -options GENERIC # Mini-root boot support # # Atari specific kernel options: