18c18
< # $FreeBSD: stable/10/sys/arm/conf/SAM9G20EK 278676 2015-02-13 15:27:46Z ian $
---
> # $FreeBSD: stable/10/sys/arm/conf/SAM9G20EK 266086 2014-05-14 20:17:31Z ian $
28c28
< makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
---
> makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
32,48c32,44
< options SCHED_4BSD # 4BSD scheduler
< options INET # InterNETworking
< #options INET6 # IPv6 communications protocols
< options GEOM_PART_BSD # BSD partition scheme
< options GEOM_PART_MBR # MBR partition scheme
< options TMPFS # Efficient memory filesystem
< options FFS # Berkeley Fast Filesystem
< #options SOFTUPDATES # Enable FFS soft updates support
< #options UFS_ACL # Support for access control lists
< #options UFS_DIRHASH # Improve performance on big directories
< #options MD_ROOT # MD is a potential root device
< #options MD_ROOT_SIZE=4096 # 4MB ram disk
< options NANDFS # NAND file system
< options NFSCL # New Network Filesystem Client
< #options NFSD # New Network Filesystem Server
< #options NFSLOCKD # Network Lock Manager
< #options NFS_ROOT # NFS usable as /, requires NFSCL
---
> options SCHED_4BSD #4BSD scheduler
> options INET #InterNETworking
> #options INET6 #IPv6 communications protocols
> options FFS #Berkeley Fast Filesystem
> #options SOFTUPDATES #Enable FFS soft updates support
> #options UFS_ACL #Support for access control lists
> #options UFS_DIRHASH #Improve performance on big directories
> #options MD_ROOT #MD is a potential root device
> #options MD_ROOT_SIZE=4096 # 3MB ram disk
> options NFSCL #New Network Filesystem Client
> #options NFSD #New Network Filesystem Server
> #options NFSLOCKD #Network Lock Manager
> #options NFS_ROOT #NFS usable as /, requires NFSCL
59,68c55,65
< #options MSDOSFS # MSDOS Filesystem
< #options CD9660 # ISO 9660 Filesystem
< #options PROCFS # Process filesystem (requires PSEUDOFS)
< #options PSEUDOFS # Pseudo-filesystem framework
< #options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
< #options KTRACE # ktrace(1) support
< options SYSVSHM # SYSV-style shared memory
< options SYSVMSG # SYSV-style message queues
< options SYSVSEM # SYSV-style semaphores
< options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
---
> #options MSDOSFS #MSDOS Filesystem
> #options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> #options PSEUDOFS #Pseudo-filesystem framework
> #options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> #options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> options SYSVSEM #SYSV-style semaphores
> options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
> #options SYSCTL_OMIT_DESCR
75,78c72,75
< #options INVARIANTS # Enable calls of extra sanity checking
< #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
< #options WITNESS # Enable checks to detect deadlocks and cycles
< #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
---
> #options INVARIANTS #Enable calls of extra sanity checking
> #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
> #options WITNESS #Enable checks to detect deadlocks and cycles
> #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
90c87
< device ate # Ethernet Driver
---
> device ate # Ethernet Driver
97,99d93
< # NAND Flash - Reference design has Samsung 256MB but others possible
< device nand # NAND interface on CS3
<
114c108
< option AT91_MCI_HAS_4WIRE
---
> #option AT91_MCI_HAS_4WIRE
122,125c116,119
< device scbus # SCSI bus (required for ATA/SCSI)
< device da # Direct Access (disks)
< device cd # CD
< device pass # Passthrough device (direct ATA/SCSI access)
---
> device scbus # SCSI bus (required for SCSI)
> device da # Direct Access (disks)
> device cd # CD
> device pass # Passthrough device (direct SCSI access)
128,133c122,128
< device ohci # OHCI localbus->USB interface
< device usb # USB Bus (required)
< device umass # Disks/Mass storage - Requires scbus and da
< device uhid # "Human Interface Devices"
< #device ulpt # Printer
< #device udbp # USB Double Bulk Pipe devices
---
> options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
> device ohci # OHCI localbus->USB interface
> device usb # USB Bus (required)
> device umass # Disks/Mass storage - Requires scbus and da
> device uhid # "Human Interface Devices"
> #device ulpt # Printer
> #device udbp # USB Double Bulk Pipe devices
136,143c131,138
< #device miibus
< #device aue # ADMtek USB Ethernet
< #device axe # ASIX Electronics USB Ethernet
< #device cdce # Generic USB over Ethernet
< #device cue # CATC USB Ethernet
< #device kue # Kawasaki LSI USB Ethernet
< #device rue # RealTek RTL8150 USB Ethernet
< #device udav # Davicom DM9601E USB
---
> device miibus
> #device aue # ADMtek USB Ethernet
> #device axe # ASIX Electronics USB Ethernet
> #device cdce # Generic USB over Ethernet
> #device cue # CATC USB Ethernet
> #device kue # Kawasaki LSI USB Ethernet
> #device rue # RealTek RTL8150 USB Ethernet
> device udav # Davicom DM9601E USB
146,149c141,144
< #device rum # Ralink Technology RT2501USB wireless NICs
< #device uath # Atheros AR5523 wireless NICs
< #device ural # Ralink Technology RT2500USB wireless NICs
< #device zyd # ZyDAS zd1211/zd1211b wireless NICs
---
> #device rum # Ralink Technology RT2501USB wireless NICs
> #device uath # Atheros AR5523 wireless NICs
> #device ural # Ralink Technology RT2500USB wireless NICs
> #device zyd # ZyDAS zd1211/zd1211b wireless NICs
152,156c147,152
< #device wlan # 802.11 support
< #device wlan_wep # 802.11 WEP support
< #device wlan_ccmp # 802.11 CCMP support
< #device wlan_tkip # 802.11 TKIP support
< #device wlan_amrr # AMRR transmit rate control algorithm
---
> #device wlan # 802.11 support
> #device wlan_wep # 802.11 WEP support
> #device wlan_ccmp # 802.11 CCMP support
> #device wlan_tkip # 802.11 TKIP support
> #device wlan_amrr # AMRR transmit rate control algorithm
>
< # $FreeBSD: stable/10/sys/arm/conf/SAM9G20EK 278676 2015-02-13 15:27:46Z ian $
---
> # $FreeBSD: stable/10/sys/arm/conf/SAM9G20EK 266086 2014-05-14 20:17:31Z ian $
28c28
< makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
---
> makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
32,48c32,44
< options SCHED_4BSD # 4BSD scheduler
< options INET # InterNETworking
< #options INET6 # IPv6 communications protocols
< options GEOM_PART_BSD # BSD partition scheme
< options GEOM_PART_MBR # MBR partition scheme
< options TMPFS # Efficient memory filesystem
< options FFS # Berkeley Fast Filesystem
< #options SOFTUPDATES # Enable FFS soft updates support
< #options UFS_ACL # Support for access control lists
< #options UFS_DIRHASH # Improve performance on big directories
< #options MD_ROOT # MD is a potential root device
< #options MD_ROOT_SIZE=4096 # 4MB ram disk
< options NANDFS # NAND file system
< options NFSCL # New Network Filesystem Client
< #options NFSD # New Network Filesystem Server
< #options NFSLOCKD # Network Lock Manager
< #options NFS_ROOT # NFS usable as /, requires NFSCL
---
> options SCHED_4BSD #4BSD scheduler
> options INET #InterNETworking
> #options INET6 #IPv6 communications protocols
> options FFS #Berkeley Fast Filesystem
> #options SOFTUPDATES #Enable FFS soft updates support
> #options UFS_ACL #Support for access control lists
> #options UFS_DIRHASH #Improve performance on big directories
> #options MD_ROOT #MD is a potential root device
> #options MD_ROOT_SIZE=4096 # 3MB ram disk
> options NFSCL #New Network Filesystem Client
> #options NFSD #New Network Filesystem Server
> #options NFSLOCKD #Network Lock Manager
> #options NFS_ROOT #NFS usable as /, requires NFSCL
59,68c55,65
< #options MSDOSFS # MSDOS Filesystem
< #options CD9660 # ISO 9660 Filesystem
< #options PROCFS # Process filesystem (requires PSEUDOFS)
< #options PSEUDOFS # Pseudo-filesystem framework
< #options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
< #options KTRACE # ktrace(1) support
< options SYSVSHM # SYSV-style shared memory
< options SYSVMSG # SYSV-style message queues
< options SYSVSEM # SYSV-style semaphores
< options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
---
> #options MSDOSFS #MSDOS Filesystem
> #options CD9660 #ISO 9660 Filesystem
> #options PROCFS #Process filesystem (requires PSEUDOFS)
> #options PSEUDOFS #Pseudo-filesystem framework
> #options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
> #options KTRACE #ktrace(1) support
> options SYSVSHM #SYSV-style shared memory
> options SYSVMSG #SYSV-style message queues
> options SYSVSEM #SYSV-style semaphores
> options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
> #options SYSCTL_OMIT_DESCR
75,78c72,75
< #options INVARIANTS # Enable calls of extra sanity checking
< #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
< #options WITNESS # Enable checks to detect deadlocks and cycles
< #options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
---
> #options INVARIANTS #Enable calls of extra sanity checking
> #options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
> #options WITNESS #Enable checks to detect deadlocks and cycles
> #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
90c87
< device ate # Ethernet Driver
---
> device ate # Ethernet Driver
97,99d93
< # NAND Flash - Reference design has Samsung 256MB but others possible
< device nand # NAND interface on CS3
<
114c108
< option AT91_MCI_HAS_4WIRE
---
> #option AT91_MCI_HAS_4WIRE
122,125c116,119
< device scbus # SCSI bus (required for ATA/SCSI)
< device da # Direct Access (disks)
< device cd # CD
< device pass # Passthrough device (direct ATA/SCSI access)
---
> device scbus # SCSI bus (required for SCSI)
> device da # Direct Access (disks)
> device cd # CD
> device pass # Passthrough device (direct SCSI access)
128,133c122,128
< device ohci # OHCI localbus->USB interface
< device usb # USB Bus (required)
< device umass # Disks/Mass storage - Requires scbus and da
< device uhid # "Human Interface Devices"
< #device ulpt # Printer
< #device udbp # USB Double Bulk Pipe devices
---
> options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
> device ohci # OHCI localbus->USB interface
> device usb # USB Bus (required)
> device umass # Disks/Mass storage - Requires scbus and da
> device uhid # "Human Interface Devices"
> #device ulpt # Printer
> #device udbp # USB Double Bulk Pipe devices
136,143c131,138
< #device miibus
< #device aue # ADMtek USB Ethernet
< #device axe # ASIX Electronics USB Ethernet
< #device cdce # Generic USB over Ethernet
< #device cue # CATC USB Ethernet
< #device kue # Kawasaki LSI USB Ethernet
< #device rue # RealTek RTL8150 USB Ethernet
< #device udav # Davicom DM9601E USB
---
> device miibus
> #device aue # ADMtek USB Ethernet
> #device axe # ASIX Electronics USB Ethernet
> #device cdce # Generic USB over Ethernet
> #device cue # CATC USB Ethernet
> #device kue # Kawasaki LSI USB Ethernet
> #device rue # RealTek RTL8150 USB Ethernet
> device udav # Davicom DM9601E USB
146,149c141,144
< #device rum # Ralink Technology RT2501USB wireless NICs
< #device uath # Atheros AR5523 wireless NICs
< #device ural # Ralink Technology RT2500USB wireless NICs
< #device zyd # ZyDAS zd1211/zd1211b wireless NICs
---
> #device rum # Ralink Technology RT2501USB wireless NICs
> #device uath # Atheros AR5523 wireless NICs
> #device ural # Ralink Technology RT2500USB wireless NICs
> #device zyd # ZyDAS zd1211/zd1211b wireless NICs
152,156c147,152
< #device wlan # 802.11 support
< #device wlan_wep # 802.11 WEP support
< #device wlan_ccmp # 802.11 CCMP support
< #device wlan_tkip # 802.11 TKIP support
< #device wlan_amrr # AMRR transmit rate control algorithm
---
> #device wlan # 802.11 support
> #device wlan_wep # 802.11 WEP support
> #device wlan_ccmp # 802.11 CCMP support
> #device wlan_tkip # 802.11 TKIP support
> #device wlan_amrr # AMRR transmit rate control algorithm
>