Module Name:    src
Committed By:   riz
Date:           Sat Nov 20 00:27:31 UTC 2010

Modified Files:
        src/sys/arch/atari/conf [netbsd-5]: ATARITT FALCON HADES MILAN-ISAIDE
            MILAN-PCIIDE SMALL030

Log Message:
Regen for ticket 1366.


To generate a diff of this commit:
cvs rdiff -u -r1.86.4.4 -r1.86.4.5 src/sys/arch/atari/conf/ATARITT
cvs rdiff -u -r1.84.4.4 -r1.84.4.5 src/sys/arch/atari/conf/FALCON
cvs rdiff -u -r1.76.4.4 -r1.76.4.5 src/sys/arch/atari/conf/HADES
cvs rdiff -u -r1.53.4.4 -r1.53.4.5 src/sys/arch/atari/conf/MILAN-ISAIDE
cvs rdiff -u -r1.57.4.4 -r1.57.4.5 src/sys/arch/atari/conf/MILAN-PCIIDE
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/atari/conf/SMALL030

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/atari/conf/ATARITT
diff -u src/sys/arch/atari/conf/ATARITT:1.86.4.4 src/sys/arch/atari/conf/ATARITT:1.86.4.5
--- src/sys/arch/atari/conf/ATARITT:1.86.4.4	Thu Mar 12 23:33:48 2009
+++ src/sys/arch/atari/conf/ATARITT	Sat Nov 20 00:27:31 2010
@@ -1,23 +1,27 @@
 #
-# $NetBSD: ATARITT,v 1.86.4.4 2009/03/12 23:33:48 snj Exp $
+# $NetBSD: ATARITT,v 1.86.4.5 2010/11/20 00:27:31 riz Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: GENERIC.in,v 1.73.4.5 2009/03/12 23:32:35 snj Exp $
+#		NetBSD$
 include "arch/atari/conf/std.atari"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
 maxusers 16
+
 options HZ=64 # Set the clock-rate (48/64/96)
+
 options INSECURE # disable kernel security levels
 options M68030 # support for 030
 options FPU_EMULATE # Support for MC68881/MC68882 emulator
 options INET # IP + ICMP + TCP + UDP
+
 options INET6 # IPV6
 options PPP_BSDCOMP # BSD-Compress compression support for PPP
 options PPP_DEFLATE # Deflate compression support for PPP
 options PPP_FILTER # Active filter support for PPP (requires bpf)
+
 options PFIL_HOOKS # pfil(9) packet filter hooks
 options IPFILTER_LOG # ipmon(8) log support
 options IPFILTER_LOOKUP # ippool(8) support
@@ -25,6 +29,7 @@
 file-system MFS # Memory based filesystem
 file-system MSDOSFS # MSDOS filesystem
 file-system CD9660 # ISO 9660 filesystem with Rock Ridge
+
 file-system KERNFS # Kernel parameter filesystem
 file-system NFS # Network File System client side code
 file-system PROCFS # Process filesystem
@@ -35,13 +40,20 @@
 file-system UMAPFS # null file system (with uid & gid remapping)
 file-system PORTAL # portal file system
 file-system EXT2FS # second extended file system (linux)
+
 file-system PTYFS # /dev/pts/N support
+
 options WAPBL # File system journaling support - Experimental
+
 options SOFTDEP # FFS soft updates support.
+
 options NFSSERVER # Network File System server side code
+
 options PANICWAIT # Require keystroke to dump/reboot
+
 options DDB # Kernel debugger
 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
+
 options COMPAT_43 # 4.3 BSD compatible system calls
 options COMPAT_10 # Compatibility with NetBSD 1.0
 options COMPAT_11 # Compatibility with NetBSD 1.1
@@ -49,71 +61,101 @@
 options COMPAT_13 # Compatibility with NetBSD 1.3
 options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
+
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
 options COMPAT_30 # NetBSD 3.0 compatibility.
 options COMPAT_40 # NetBSD 4.0 compatibility.
+
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
+
 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
 options SYSVSHM # System V shared memory
 options SYSVMSG # System V messages
 options SYSVSEM # System V semaphores
 options P1003_1B_SEMAPHORE # p1003.1b semaphore support
+
 options KTRACE # Add kernel tracing system call
+
 options USERCONF # userconf(4) support
+
 options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+
 options SCSIVERBOSE # human readable SCSI error messages
 options ST_POOL_SIZE=24 # smallest that allows TT-HIGH
+
 options TT_SCSI # SCSI-support for TT
 options TT_VIDEO # Graphics support for TT
+
 options MEMORY_DISK_HOOKS # Boot RAM-disk
 options DISKLABEL_NBDA # NetBSD disklabels (required)
 options DISKLABEL_AHDI # NetBSD/AHDI disklabels
+
 options SERCONSOLE # modem1 console support, breaks Falcon
+
 options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM
 options MSGBUFSIZE=32768 # size of kernel msg. buffer
+
 options TRY_SCSI_LINKED_COMMANDS=0x7f
+
 config netbsd root on ? type ?
+
 pseudo-device sl # Slip
+
 pseudo-device ppp # ppp
+
 pseudo-device pppoe # PPP over Ethernet (RFC 2516)
+
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
+
 pseudo-device md 3 # Boot memory disk
+
 pseudo-device vnd # 3 pseudo disks (see vnconfig)
 pseudo-device bpfilter # berkeley packet filters
+
 pseudo-device tun # network tunnel
 pseudo-device tap # virtual Ethernet
+
 pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
+
 pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
+
 pseudo-device ccd 4 # concatenating disk driver
 pseudo-device fss 4 # file system snapshot device
 pseudo-device ipfilter # IP filtering device
 pseudo-device rnd # /dev/random and in-kernel generator
 pseudo-device clockctl # user control of clock subsystem
 pseudo-device view 4 # View (graphics mapping)
+
 pseudo-device mouse 1 # mouse
+
 ncrscsi0 at mainbus0 # NCR5380 SCSI driver
 zs0 at mainbus0 # Serial support through 8530
-grfbus0 at mainbus0 # bitmapped display's
+grfbus0 at mainbus0 # bitmapped display's'
 grfcc0 at grfbus0 # graphics driver
 ite0 at grfcc0 # console
 nvr0 at mainbus0 # nvram driver
+
 grfcc1 at grfbus0 # 2nd graphics driver
 ite1 at grfcc1 # 2nd tty
 grfcc2 at grfbus0 # 3rd graphics driver
 ite2 at grfcc2 # 3rd tty
 lp0 at mainbus0 # centronics printer
 ser0 at mainbus0 # UART on first 68901 (ttyB0)
+
 avmebus0 at mainbus0 # VME bus
 vme0 at avmebus0
 le0 at vme0 irq 5 # Lance ethernet (Riebl/PAM).
 le0 at vme0 irq 4 # Lance ethernet (BVME410).
+we0 at vme0 irq 4 # SMC Elite Ultra with SMC_TT VME-ISA bridge
 et0 at vme0 # Crazy Dots II
 scsibus* at scsi? # SCSI bus
 sd* at scsibus? target ? lun ? # SCSI disk drives
 cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
+
 st* at scsibus? target ? lun ? # SCSI tape drives
 ch* at scsibus? target ? lun ? # SCSI autochangers
 ss* at scsibus? target ? lun ? # SCSI scanners

Index: src/sys/arch/atari/conf/FALCON
diff -u src/sys/arch/atari/conf/FALCON:1.84.4.4 src/sys/arch/atari/conf/FALCON:1.84.4.5
--- src/sys/arch/atari/conf/FALCON:1.84.4.4	Thu Mar 12 23:33:48 2009
+++ src/sys/arch/atari/conf/FALCON	Sat Nov 20 00:27:31 2010
@@ -1,27 +1,33 @@
 #
-# $NetBSD: FALCON,v 1.84.4.4 2009/03/12 23:33:48 snj Exp $
+# $NetBSD: FALCON,v 1.84.4.5 2010/11/20 00:27:31 riz Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: GENERIC.in,v 1.73.4.5 2009/03/12 23:32:35 snj Exp $
+#		NetBSD$
 include "arch/atari/conf/std.atari"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
 maxusers 16
+
 options HZ=64 # Set the clock-rate (48/64/96)
+
 options INSECURE # disable kernel security levels
 options M68030 # support for 030
 options FPU_EMULATE # Support for MC68881/MC68882 emulator
+
 options M68040 # support for 040
 options M68060 # support for 060
 options FPSP # 68040 Floatingpoint support
 options M060SP # MC68060 software support (Required for 060)
+
 options INET # IP + ICMP + TCP + UDP
+
 options INET6 # IPV6
 options PPP_BSDCOMP # BSD-Compress compression support for PPP
 options PPP_DEFLATE # Deflate compression support for PPP
 options PPP_FILTER # Active filter support for PPP (requires bpf)
+
 options PFIL_HOOKS # pfil(9) packet filter hooks
 options IPFILTER_LOG # ipmon(8) log support
 options IPFILTER_LOOKUP # ippool(8) support
@@ -29,6 +35,7 @@
 file-system MFS # Memory based filesystem
 file-system MSDOSFS # MSDOS filesystem
 file-system CD9660 # ISO 9660 filesystem with Rock Ridge
+
 file-system KERNFS # Kernel parameter filesystem
 file-system NFS # Network File System client side code
 file-system PROCFS # Process filesystem
@@ -39,13 +46,20 @@
 file-system UMAPFS # null file system (with uid & gid remapping)
 file-system PORTAL # portal file system
 file-system EXT2FS # second extended file system (linux)
+
 file-system PTYFS # /dev/pts/N support
+
 options WAPBL # File system journaling support - Experimental
+
 options SOFTDEP # FFS soft updates support.
+
 options NFSSERVER # Network File System server side code
+
 options PANICWAIT # Require keystroke to dump/reboot
+
 options DDB # Kernel debugger
 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
+
 options COMPAT_43 # 4.3 BSD compatible system calls
 options COMPAT_10 # Compatibility with NetBSD 1.0
 options COMPAT_11 # Compatibility with NetBSD 1.1
@@ -53,55 +67,80 @@
 options COMPAT_13 # Compatibility with NetBSD 1.3
 options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
+
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
 options COMPAT_30 # NetBSD 3.0 compatibility.
 options COMPAT_40 # NetBSD 4.0 compatibility.
+
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
+
 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
 options SYSVSHM # System V shared memory
 options SYSVMSG # System V messages
 options SYSVSEM # System V semaphores
 options P1003_1B_SEMAPHORE # p1003.1b semaphore support
+
 options KTRACE # Add kernel tracing system call
+
 options USERCONF # userconf(4) support
+
 options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+
 options SCSIVERBOSE # human readable SCSI error messages
 options ST_POOL_SIZE=24 # smallest that allows TT-HIGH
+
 options FALCON_SCSI # SCSI-support for Falcon
 options FALCON_VIDEO # Graphics support for FALCON
+
 options MEMORY_DISK_HOOKS # Boot RAM-disk
 options DISKLABEL_NBDA # NetBSD disklabels (required)
 options DISKLABEL_AHDI # NetBSD/AHDI disklabels
+
 options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM
 options MSGBUFSIZE=32768 # size of kernel msg. buffer
+
 options TRY_SCSI_LINKED_COMMANDS=0x7f
+
 config netbsd root on ? type ?
+
 pseudo-device sl # Slip
+
 pseudo-device ppp # ppp
+
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
+
 pseudo-device md 3 # Boot memory disk
+
 pseudo-device vnd # 3 pseudo disks (see vnconfig)
 pseudo-device bpfilter # berkeley packet filters
+
 pseudo-device tun # network tunnel
 pseudo-device tap # virtual Ethernet
+
 pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
+
 pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
+
 pseudo-device ccd 4 # concatenating disk driver
 pseudo-device fss 4 # file system snapshot device
 pseudo-device ipfilter # IP filtering device
 pseudo-device rnd # /dev/random and in-kernel generator
 pseudo-device clockctl # user control of clock subsystem
 pseudo-device view 4 # View (graphics mapping)
+
 pseudo-device mouse 1 # mouse
+
 ncrscsi0 at mainbus0 # NCR5380 SCSI driver
 zs0 at mainbus0 # Serial support through 8530
-grfbus0 at mainbus0 # bitmapped display's
+grfbus0 at mainbus0 # bitmapped display's'
 grfcc0 at grfbus0 # graphics driver
 ite0 at grfcc0 # console
 nvr0 at mainbus0 # nvram driver
+
 grfcc1 at grfbus0 # 2nd graphics driver
 ite1 at grfcc1 # 2nd tty
 grfcc2 at grfbus0 # 3rd graphics driver
@@ -111,11 +150,15 @@
 wdc0 at mainbus0 # IDE-bus
 atabus* at wdc? channel ?
 wd* at atabus? drive ?
+
 atapibus* at atabus?
+
 cd* at atapibus? drive ? # ATAPI CD-ROM drives
+
 scsibus* at scsi? # SCSI bus
 sd* at scsibus? target ? lun ? # SCSI disk drives
 cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
+
 st* at scsibus? target ? lun ? # SCSI tape drives
 ch* at scsibus? target ? lun ? # SCSI autochangers
 ss* at scsibus? target ? lun ? # SCSI scanners

Index: src/sys/arch/atari/conf/HADES
diff -u src/sys/arch/atari/conf/HADES:1.76.4.4 src/sys/arch/atari/conf/HADES:1.76.4.5
--- src/sys/arch/atari/conf/HADES:1.76.4.4	Thu Mar 12 23:33:48 2009
+++ src/sys/arch/atari/conf/HADES	Sat Nov 20 00:27:31 2010
@@ -1,26 +1,31 @@
 #
-# $NetBSD: HADES,v 1.76.4.4 2009/03/12 23:33:48 snj Exp $
+# $NetBSD: HADES,v 1.76.4.5 2010/11/20 00:27:31 riz Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: HADES.in,v 1.8.88.1 2009/01/26 03:07:52 snj Exp $
-#		NetBSD: GENERIC.in,v 1.73.4.5 2009/03/12 23:32:35 snj Exp $
+#		NetBSD$
 include "arch/atari/conf/std.hades"
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
 maxusers 16
+
 options HZ=64 # Set the clock-rate (48/64/96)
+
 options INSECURE # disable kernel security levels
 options M68040 # support for 040
 options M68060 # support for 060
 options FPSP # 68040 Floatingpoint support
 options M060SP # MC68060 software support (Required for 060)
+
 options INET # IP + ICMP + TCP + UDP
+
 options INET6 # IPV6
 options PPP_BSDCOMP # BSD-Compress compression support for PPP
 options PPP_DEFLATE # Deflate compression support for PPP
 options PPP_FILTER # Active filter support for PPP (requires bpf)
+
 options PFIL_HOOKS # pfil(9) packet filter hooks
 options IPFILTER_LOG # ipmon(8) log support
 options IPFILTER_LOOKUP # ippool(8) support
@@ -28,6 +33,7 @@
 file-system MFS # Memory based filesystem
 file-system MSDOSFS # MSDOS filesystem
 file-system CD9660 # ISO 9660 filesystem with Rock Ridge
+
 file-system KERNFS # Kernel parameter filesystem
 file-system NFS # Network File System client side code
 file-system PROCFS # Process filesystem
@@ -38,13 +44,20 @@
 file-system UMAPFS # null file system (with uid & gid remapping)
 file-system PORTAL # portal file system
 file-system EXT2FS # second extended file system (linux)
+
 file-system PTYFS # /dev/pts/N support
+
 options WAPBL # File system journaling support - Experimental
+
 options SOFTDEP # FFS soft updates support.
+
 options NFSSERVER # Network File System server side code
+
 options PANICWAIT # Require keystroke to dump/reboot
+
 options DDB # Kernel debugger
 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
+
 options COMPAT_43 # 4.3 BSD compatible system calls
 options COMPAT_10 # Compatibility with NetBSD 1.0
 options COMPAT_11 # Compatibility with NetBSD 1.1
@@ -52,67 +65,96 @@
 options COMPAT_13 # Compatibility with NetBSD 1.3
 options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
+
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
 options COMPAT_30 # NetBSD 3.0 compatibility.
 options COMPAT_40 # NetBSD 4.0 compatibility.
+
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
+
 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
 options SYSVSHM # System V shared memory
 options SYSVMSG # System V messages
 options SYSVSEM # System V semaphores
 options P1003_1B_SEMAPHORE # p1003.1b semaphore support
+
 options KTRACE # Add kernel tracing system call
+
 options USERCONF # userconf(4) support
+
 options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+
 options SCSIVERBOSE # human readable SCSI error messages
+
 options MIIVERBOSE # verbose PHY autoconfig messages
 options ST_POOL_SIZE=24 # smallest that allows TT-HIGH
+
 options TT_SCSI # SCSI-support for TT
 options TT_VIDEO # Graphics support for TT
+
 options MEMORY_DISK_HOOKS # Boot RAM-disk
 options DISKLABEL_NBDA # NetBSD disklabels (required)
 options DISKLABEL_AHDI # NetBSD/AHDI disklabels
+
 options SERCONSOLE # modem1 console support, breaks Falcon
+
 options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM
 options MSGBUFSIZE=32768 # size of kernel msg. buffer
+
 options TRY_SCSI_LINKED_COMMANDS=0x7f
+
 config netbsd root on ? type ?
+
 pseudo-device sl # Slip
+
 pseudo-device ppp # ppp
+
 pseudo-device pppoe # PPP over Ethernet (RFC 2516)
+
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
+
 pseudo-device md 3 # Boot memory disk
+
 pseudo-device vnd # 3 pseudo disks (see vnconfig)
 pseudo-device bpfilter # berkeley packet filters
+
 pseudo-device tun # network tunnel
 pseudo-device tap # virtual Ethernet
+
 pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
+
 pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
+
 pseudo-device ccd 4 # concatenating disk driver
 pseudo-device fss 4 # file system snapshot device
 pseudo-device ipfilter # IP filtering device
 pseudo-device rnd # /dev/random and in-kernel generator
 pseudo-device clockctl # user control of clock subsystem
+
 exphy* at mii? phy ? # 3Com internal PHYs
 inphy* at mii? phy ? # Intel 82555 PHYs
 iophy* at mii? phy ? # Intel 82553 PHYs
 ukphy* at mii? phy ? # generic unknown PHYs
+
 ep* at pci? dev ? function ? # 3Com 3c59x
 fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
+
 eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
 audio* at eso?
 pseudo-device view 4 # View (graphics mapping)
 pseudo-device mouse 1 # mouse
+
 ncrscsi0 at mainbus0 # NCR5380 SCSI driver
 scsibus0 at ncrscsi0 # SCSI bus
 zs0 at mainbus0 # Serial support through 8530
 nvr0 at mainbus0 # nvram driver
 lp0 at mainbus0 # centronics printer
 ser0 at mainbus0 # UART on first 68901 (ttyB0)
-grfbus0 at mainbus0 # bitmapped display's
+grfbus0 at mainbus0 # bitmapped display's'
 grfet0 at grfbus0 # et4000/et6000/et6100 consoles
 ite0 at grfet0
 grfet1 at grfbus0
@@ -121,6 +163,7 @@
 ite2 at grfet2
 pcib0 at mainbus0 # PCI-bus
 pci0 at pcib0
+
 avmebus0 at mainbus0 # VME bus
 vme0 at avmebus0
 le0 at vme0 irq 5 # Lance ethernet (Riebl/PAM).
@@ -131,16 +174,22 @@
 wdc0 at mainbus0 # IDE-bus
 atabus* at wdc? channel ?
 wd* at atabus? drive ?
+
 atapibus* at atabus?
+
 cd* at atapibus? drive ? # ATAPI CD-ROM drives
+
 sd* at scsibus? target ? lun ? # SCSI disk drives
 st* at scsibus? target ? lun ? # SCSI tape drives
 cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
+
 ch* at scsibus? target ? lun ? # SCSI autochangers
 ss* at scsibus? target ? lun ? # SCSI scanners
 se* at scsibus? target ? lun ? # SCSI ethernet
 uk* at scsibus? target ? lun ? # SCSI unknown
+
 ne0 at isa0 port 0x300 irq 5 # NE2000 ethernet
 ep* at pci0 dev ? function 0 # 3Com 3c59x/3c90x Ethernet
+
 eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
 audio* at eso?

Index: src/sys/arch/atari/conf/MILAN-ISAIDE
diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.4 src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.5
--- src/sys/arch/atari/conf/MILAN-ISAIDE:1.53.4.4	Thu Mar 12 23:33:48 2009
+++ src/sys/arch/atari/conf/MILAN-ISAIDE	Sat Nov 20 00:27:31 2010
@@ -1,26 +1,32 @@
 #
-# $NetBSD: MILAN-ISAIDE,v 1.53.4.4 2009/03/12 23:33:48 snj Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.53.4.5 2010/11/20 00:27:31 riz Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: MILAN.in,v 1.21.70.1 2009/01/26 03:07:52 snj Exp $
-#		NetBSD: GENERIC.in,v 1.73.4.5 2009/03/12 23:32:35 snj Exp $
+#		NetBSD$
 include "arch/atari/conf/std.milan"
+
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
 maxusers 16
+
 options HZ=64 # Set the clock-rate (48/64/96)
+
 options INSECURE # disable kernel security levels
 options M68040 # support for 040
 options M68060 # support for 060
 options FPSP # 68040 Floatingpoint support
 options M060SP # MC68060 software support (Required for 060)
+
 options INET # IP + ICMP + TCP + UDP
+
 options INET6 # IPV6
 options PPP_BSDCOMP # BSD-Compress compression support for PPP
 options PPP_DEFLATE # Deflate compression support for PPP
 options PPP_FILTER # Active filter support for PPP (requires bpf)
+
 options PFIL_HOOKS # pfil(9) packet filter hooks
 options IPFILTER_LOG # ipmon(8) log support
 options IPFILTER_LOOKUP # ippool(8) support
@@ -28,6 +34,7 @@
 file-system MFS # Memory based filesystem
 file-system MSDOSFS # MSDOS filesystem
 file-system CD9660 # ISO 9660 filesystem with Rock Ridge
+
 file-system KERNFS # Kernel parameter filesystem
 file-system NFS # Network File System client side code
 file-system PROCFS # Process filesystem
@@ -38,13 +45,20 @@
 file-system UMAPFS # null file system (with uid & gid remapping)
 file-system PORTAL # portal file system
 file-system EXT2FS # second extended file system (linux)
+
 file-system PTYFS # /dev/pts/N support
+
 options WAPBL # File system journaling support - Experimental
+
 options SOFTDEP # FFS soft updates support.
+
 options NFSSERVER # Network File System server side code
+
 options PANICWAIT # Require keystroke to dump/reboot
+
 options DDB # Kernel debugger
 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
+
 options COMPAT_43 # 4.3 BSD compatible system calls
 options COMPAT_10 # Compatibility with NetBSD 1.0
 options COMPAT_11 # Compatibility with NetBSD 1.1
@@ -52,61 +66,90 @@
 options COMPAT_13 # Compatibility with NetBSD 1.3
 options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
+
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
 options COMPAT_30 # NetBSD 3.0 compatibility.
 options COMPAT_40 # NetBSD 4.0 compatibility.
+
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
+
 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
 options SYSVSHM # System V shared memory
 options SYSVMSG # System V messages
 options SYSVSEM # System V semaphores
 options P1003_1B_SEMAPHORE # p1003.1b semaphore support
+
 options KTRACE # Add kernel tracing system call
+
 options USERCONF # userconf(4) support
+
 options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+
 options SCSIVERBOSE # human readable SCSI error messages
+
 options MIIVERBOSE # verbose PHY autoconfig messages
 options ST_POOL_SIZE=24 # smallest that allows TT-HIGH
 options MEMORY_DISK_HOOKS # Boot RAM-disk
 options DISKLABEL_NBDA # NetBSD disklabels (required)
 options DISKLABEL_AHDI # NetBSD/AHDI disklabels
+
 options SERCONSOLE # modem1 console support, breaks Falcon
+
 options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM
 options MSGBUFSIZE=32768 # size of kernel msg. buffer
+
 options TRY_SCSI_LINKED_COMMANDS=0x7f
+
 config netbsd root on ? type ?
+
 pseudo-device sl # Slip
+
 pseudo-device ppp # ppp
+
 pseudo-device pppoe # PPP over Ethernet (RFC 2516)
+
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
+
 pseudo-device md 3 # Boot memory disk
+
 pseudo-device vnd # 3 pseudo disks (see vnconfig)
 pseudo-device bpfilter # berkeley packet filters
+
 pseudo-device tun # network tunnel
 pseudo-device tap # virtual Ethernet
+
 pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
+
 pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
+
 pseudo-device ccd 4 # concatenating disk driver
 pseudo-device fss 4 # file system snapshot device
 pseudo-device ipfilter # IP filtering device
 pseudo-device rnd # /dev/random and in-kernel generator
 pseudo-device clockctl # user control of clock subsystem
+
 exphy* at mii? phy ? # 3Com internal PHYs
 inphy* at mii? phy ? # Intel 82555 PHYs
 iophy* at mii? phy ? # Intel 82553 PHYs
 ukphy* at mii? phy ? # generic unknown PHYs
+
 ep* at pci? dev ? function ? # 3Com 3c59x
 fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
+
 eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
 audio* at eso?
 options WSEMUL_VT100 # VT100 / VT220 emulation
+
 options WS_KERNEL_FG=WSCOL_WHITE
 options WS_KERNEL_BG=WSCOL_BLACK
 options WSDISPLAY_DEFAULTSCREENS=4
+
 options PCDISPLAY_SOFTCURSOR
+
 isab0 at mainbus0 # ISA-bus
 isa0 at isab0
 pcib0 at mainbus0 # PCI-bus
@@ -118,11 +161,14 @@
 wdc0 at isa? port 0x1f0 irq 14 flags 0x04 # 1st IDE controller
 wdc1 at isa? port 0x170 irq 15 flags 0x04 # 2nd IDE controller
 atabus* at ata? channel ?
+
 vga0 at pci? dev ? function ? # a PCI VGA card
 wsdisplay* at vga? console ? # as a wscons console
 pckbc0 at isa? # PC keyboard controller
 pckbd* at pckbc? # PC keyboard
 wskbd* at pckbd? console ? # wscons keyboard
+
 wd* at atabus? drive ?
 atapibus* at atabus? # ATAPI bus support
+
 cd* at atapibus? drive ? # ATAPI CD-ROM drives

Index: src/sys/arch/atari/conf/MILAN-PCIIDE
diff -u src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.4 src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.5
--- src/sys/arch/atari/conf/MILAN-PCIIDE:1.57.4.4	Thu Mar 12 23:33:48 2009
+++ src/sys/arch/atari/conf/MILAN-PCIIDE	Sat Nov 20 00:27:31 2010
@@ -1,26 +1,32 @@
 #
-# $NetBSD: MILAN-PCIIDE,v 1.57.4.4 2009/03/12 23:33:48 snj Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.57.4.5 2010/11/20 00:27:31 riz Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
 #		NetBSD: MILAN.in,v 1.21.70.1 2009/01/26 03:07:52 snj Exp $
-#		NetBSD: GENERIC.in,v 1.73.4.5 2009/03/12 23:32:35 snj Exp $
+#		NetBSD$
 include "arch/atari/conf/std.milan"
+
 options INCLUDE_CONFIG_FILE # embed config file in kernel binary
 maxusers 16
+
 options HZ=64 # Set the clock-rate (48/64/96)
+
 options INSECURE # disable kernel security levels
 options M68040 # support for 040
 options M68060 # support for 060
 options FPSP # 68040 Floatingpoint support
 options M060SP # MC68060 software support (Required for 060)
+
 options INET # IP + ICMP + TCP + UDP
+
 options INET6 # IPV6
 options PPP_BSDCOMP # BSD-Compress compression support for PPP
 options PPP_DEFLATE # Deflate compression support for PPP
 options PPP_FILTER # Active filter support for PPP (requires bpf)
+
 options PFIL_HOOKS # pfil(9) packet filter hooks
 options IPFILTER_LOG # ipmon(8) log support
 options IPFILTER_LOOKUP # ippool(8) support
@@ -28,6 +34,7 @@
 file-system MFS # Memory based filesystem
 file-system MSDOSFS # MSDOS filesystem
 file-system CD9660 # ISO 9660 filesystem with Rock Ridge
+
 file-system KERNFS # Kernel parameter filesystem
 file-system NFS # Network File System client side code
 file-system PROCFS # Process filesystem
@@ -38,13 +45,20 @@
 file-system UMAPFS # null file system (with uid & gid remapping)
 file-system PORTAL # portal file system
 file-system EXT2FS # second extended file system (linux)
+
 file-system PTYFS # /dev/pts/N support
+
 options WAPBL # File system journaling support - Experimental
+
 options SOFTDEP # FFS soft updates support.
+
 options NFSSERVER # Network File System server side code
+
 options PANICWAIT # Require keystroke to dump/reboot
+
 options DDB # Kernel debugger
 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
+
 options COMPAT_43 # 4.3 BSD compatible system calls
 options COMPAT_10 # Compatibility with NetBSD 1.0
 options COMPAT_11 # Compatibility with NetBSD 1.1
@@ -52,61 +66,90 @@
 options COMPAT_13 # Compatibility with NetBSD 1.3
 options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
+
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
 options COMPAT_30 # NetBSD 3.0 compatibility.
 options COMPAT_40 # NetBSD 4.0 compatibility.
+
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
+
 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+
 options SYSVSHM # System V shared memory
 options SYSVMSG # System V messages
 options SYSVSEM # System V semaphores
 options P1003_1B_SEMAPHORE # p1003.1b semaphore support
+
 options KTRACE # Add kernel tracing system call
+
 options USERCONF # userconf(4) support
+
 options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+
 options SCSIVERBOSE # human readable SCSI error messages
+
 options MIIVERBOSE # verbose PHY autoconfig messages
 options ST_POOL_SIZE=24 # smallest that allows TT-HIGH
 options MEMORY_DISK_HOOKS # Boot RAM-disk
 options DISKLABEL_NBDA # NetBSD disklabels (required)
 options DISKLABEL_AHDI # NetBSD/AHDI disklabels
+
 options SERCONSOLE # modem1 console support, breaks Falcon
+
 options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM
 options MSGBUFSIZE=32768 # size of kernel msg. buffer
+
 options TRY_SCSI_LINKED_COMMANDS=0x7f
+
 config netbsd root on ? type ?
+
 pseudo-device sl # Slip
+
 pseudo-device ppp # ppp
+
 pseudo-device pppoe # PPP over Ethernet (RFC 2516)
+
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
+
 pseudo-device md 3 # Boot memory disk
+
 pseudo-device vnd # 3 pseudo disks (see vnconfig)
 pseudo-device bpfilter # berkeley packet filters
+
 pseudo-device tun # network tunnel
 pseudo-device tap # virtual Ethernet
+
 pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
+
 pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
+
 pseudo-device ccd 4 # concatenating disk driver
 pseudo-device fss 4 # file system snapshot device
 pseudo-device ipfilter # IP filtering device
 pseudo-device rnd # /dev/random and in-kernel generator
 pseudo-device clockctl # user control of clock subsystem
+
 exphy* at mii? phy ? # 3Com internal PHYs
 inphy* at mii? phy ? # Intel 82555 PHYs
 iophy* at mii? phy ? # Intel 82553 PHYs
 ukphy* at mii? phy ? # generic unknown PHYs
+
 ep* at pci? dev ? function ? # 3Com 3c59x
 fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
+
 eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
 audio* at eso?
 options WSEMUL_VT100 # VT100 / VT220 emulation
+
 options WS_KERNEL_FG=WSCOL_WHITE
 options WS_KERNEL_BG=WSCOL_BLACK
 options WSDISPLAY_DEFAULTSCREENS=4
+
 options PCDISPLAY_SOFTCURSOR
+
 isab0 at mainbus0 # ISA-bus
 isa0 at isab0
 pcib0 at mainbus0 # PCI-bus
@@ -129,12 +172,16 @@
 siside* at pci? dev ? function ? # SiS IDE controllers
 slide* at pci? dev ? function ? # Symphony Labs IDE controllers
 viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
+
 atabus* at ata? channel ?
+
 vga0 at pci? dev ? function ? # a PCI VGA card
 wsdisplay* at vga? console ? # as a wscons console
 pckbc0 at isa? # PC keyboard controller
 pckbd* at pckbc? # PC keyboard
 wskbd* at pckbd? console ? # wscons keyboard
+
 wd* at atabus? drive ?
 atapibus* at atabus? # ATAPI bus support
+
 cd* at atapibus? drive ? # ATAPI CD-ROM drives

Index: src/sys/arch/atari/conf/SMALL030
diff -u src/sys/arch/atari/conf/SMALL030:1.1.2.3 src/sys/arch/atari/conf/SMALL030:1.1.2.4
--- src/sys/arch/atari/conf/SMALL030:1.1.2.3	Thu Mar 12 23:33:48 2009
+++ src/sys/arch/atari/conf/SMALL030	Sat Nov 20 00:27:31 2010
@@ -1,15 +1,18 @@
 #
-# $NetBSD: SMALL030,v 1.1.2.3 2009/03/12 23:33:48 snj Exp $
+# $NetBSD: SMALL030,v 1.1.2.4 2010/11/20 00:27:31 riz Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
 #
 # Created from:
-#		NetBSD: GENERIC.in,v 1.73.4.5 2009/03/12 23:32:35 snj Exp $
+#		NetBSD$
 include "arch/atari/conf/std.atari"
+
 makeoptions COPTS="-Os"
 maxusers 16
+
 options HZ=64 # Set the clock-rate (48/64/96)
+
 options INSECURE # disable kernel security levels
 options M68030 # support for 030
 options FPU_EMULATE # Support for MC68881/MC68882 emulator
@@ -27,30 +30,40 @@
 options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
 options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 options ST_POOL_SIZE=24 # smallest that allows TT-HIGH
+
 options TT_SCSI # SCSI-support for TT
 options TT_VIDEO # Graphics support for TT
+
 options FALCON_SCSI # SCSI-support for Falcon
 options FALCON_VIDEO # Graphics support for FALCON
+
 options MEMORY_DISK_HOOKS # Boot RAM-disk
 options DISKLABEL_NBDA # NetBSD disklabels (required)
 options DISKLABEL_AHDI # NetBSD/AHDI disklabels
 config netbsd root on ? type ?
+
 pseudo-device sl # Slip
+
 pseudo-device pty # pseudo-terminals
 pseudo-device loop # Loopback network
+
 pseudo-device md 3 # Boot memory disk
 pseudo-device view 4 # View (graphics mapping)
+
 ncrscsi0 at mainbus0 # NCR5380 SCSI driver
 zs0 at mainbus0 # Serial support through 8530
-grfbus0 at mainbus0 # bitmapped display's
+grfbus0 at mainbus0 # bitmapped display's'
 grfcc0 at grfbus0 # graphics driver
 ite0 at grfcc0 # console
 nvr0 at mainbus0 # nvram driver
 wdc0 at mainbus0 # IDE-bus
 atabus* at wdc? channel ?
 wd* at atabus? drive ?
+
 atapibus* at atabus?
+
 cd* at atapibus? drive ? # ATAPI CD-ROM drives
+
 scsibus* at scsi? # SCSI bus
 sd* at scsibus? target ? lun ? # SCSI disk drives
 cd* at scsibus? target ? lun ? # SCSI CD-ROM drives

Reply via email to