Module Name: src Committed By: matt Date: Fri Apr 29 09:23:16 UTC 2011
Modified Files: src/sys/arch/evbmips/conf [matt-nb5-mips64]: XLSATX Log Message: White space cleanup. To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/arch/evbmips/conf/XLSATX Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/evbmips/conf/XLSATX diff -u src/sys/arch/evbmips/conf/XLSATX:1.1.2.13 src/sys/arch/evbmips/conf/XLSATX:1.1.2.14 --- src/sys/arch/evbmips/conf/XLSATX:1.1.2.13 Tue Feb 8 19:04:43 2011 +++ src/sys/arch/evbmips/conf/XLSATX Fri Apr 29 09:23:16 2011 @@ -1,8 +1,8 @@ -# $NetBSD: XLSATX,v 1.1.2.13 2011/02/08 19:04:43 cliff Exp $ +# $NetBSD: XLSATX,v 1.1.2.14 2011/04/29 09:23:16 matt Exp $ include "arch/evbmips/conf/std.rmixl" -#ident "XLSATX-$Revision: 1.1.2.13 $" +#ident "XLSATX-$Revision: 1.1.2.14 $" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary @@ -11,13 +11,13 @@ # # MEMSIZE can be used to limit memory amount used # -#options MEMSIZE=0x10000000 # 256MB +#options MEMSIZE=0x10000000 # 256MB # # MEMLIMIT can be used to limit memory address used # defparam opt_memsize.h MEMLIMIT -#options MEMLIMIT=0x10000000 # 256MB +#options MEMLIMIT=0x10000000 # 256MB options NOFPU # No FPU #options FPEMUL # emulate FPU insn @@ -39,7 +39,6 @@ options USERCONF # userconf(4) support #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel options DDB # kernel dynamic debugger -options MIPS_DDB_WATCH # enable T_WATCH (see IEU_DEFAUTURE[DBE]) options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG="-g" # compile full symbol table options SYMTAB_SPACE=500000 # size for embedded symbol table @@ -68,20 +67,20 @@ file-system MFS # memory-based filesystem #file-system EXT2FS # second extended file system (linux) file-system NFS # Sun NFS-compatible filesystem client -#file-system KERNFS # kernel data-structure filesystem +file-system KERNFS # kernel data-structure filesystem #file-system NULLFS # NULL layered filesystem #file-system OVERLAY # overlay file system #file-system FDESC # user file descriptor filesystem #file-system UMAPFS # uid/gid remapping filesystem #file-system LFS # Log-based filesystem (still experimental) -#file-system PORTAL # portal filesystem (still experimental) -#file-system PROCFS # /proc +#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) +file-system PROCFS # /proc #file-system CD9660 # ISO 9660 + Rock Ridge file system file-system TMPFS # Efficient memory file system #file-system UNION # union file system #file-system MSDOSFS # MS-DOS FAT filesystem(s). #file-system CODA # Coda File System; also needs vcoda (below) -#file-system PTYFS # /dev/pts/N support +file-system PTYFS # /dev/pts/N support # File system options #options NFSSERVER # Sun NFS-compatible filesystem server @@ -140,16 +139,16 @@ mainbus0 at root -cpunode* at mainbus? node ? -cpucore* at cpunode? core ? +cpunode* at mainbus? node ? +cpucore* at cpunode? core ? cpu* at cpucore? thread ? obio0 at cpunode? com0 at obio0 addr 0x14000 intr 9 com1 at obio0 addr 0x15000 intr 10 options COM_REGMAP -rmixl_pcix0 at obio0 +rmixl_pcix0 at obio0 pci* at rmixl_pcix0 -rmixl_pcie0 at obio0 +rmixl_pcie0 at obio0 pci* at rmixl_pcie0 ppb* at pci? pci* at ppb? @@ -160,11 +159,11 @@ msk* at mskc? makphy* at mii? phy ? # Marvell 88E1000 PHYs ukphy* at mii? phy ? # unknown PHY -rmixl_usbi0 at obio0 addr 0x25000 intr 31 +rmixl_usbi0 at obio0 addr 0x25000 intr 31 ohci0 at rmixl_usbi0 addr 0x24400 size 0x400 intr 0 ohci1 at rmixl_usbi0 addr 0x24800 size 0x400 intr 1 ehci0 at rmixl_usbi0 addr 0x24000 size 0x400 intr 2 -siisata* at pci? dev ? function ? +siisata* at pci? dev ? function ? atabus* at ata? wd* at atabus? drive ? flags 0x0000 @@ -175,7 +174,7 @@ uhub* at uhub? port ? umass* at uhub? port ? configuration ? interface ? wd* at umass? -scsibus* at umass? channel ? +scsibus* at umass? channel ? sd* at scsibus? target ? lun ?