Index: head/sys/arm/conf/DB-88F6XXX =================================================================== --- head/sys/arm/conf/DB-88F6XXX (revision 282713) +++ head/sys/arm/conf/DB-88F6XXX (revision 282714) @@ -1,98 +1,99 @@ # # Custom kernel for Marvell DB-88F6xxx boards. # # $FreeBSD$ # ident DB-88F6XXX include "std.arm" include "../mv/kirkwood/std.db88f6xxx" options SOC_MV_KIRKWOOD -#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" 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 NANDFS # NAND Filesystem options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=mge0 - -#options ROOTDEVNAME=\"ufs:/dev/da0a\" - +options TMPFS # Efficient memory filesystem +options GEOM_PART_BSD # BSD partition scheme +options GEOM_PART_MBR # MBR partition scheme 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 _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options MUTEX_NOINLINE options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING -# Debugging +# Debugging for use in -current +#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options ALT_BREAK_TO_DEBUGGER -options DDB +options KDB # Enable kernel debugger support +options DDB # Enable the kernel debugger #options DEADLKRES # Enable the deadlock resolver -#options DIAGNOSTIC #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options KDB options WITNESS # Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed #options WITNESS_KDB +#options DIAGNOSTIC +# NFS root from boopt/dhcp +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=mge0 + +#options ROOTDEVNAME=\"ufs:/dev/da0a\" + device pci # Pseudo devices device loop device md device random # Serial ports device uart # Networking device ether device mge # Marvell Gigabit Ethernet controller device mii device e1000phy device bpf device cesa # Marvell security engine device crypto device cryptodev # USB options USB_DEBUG # enable debug msgs device usb device ehci device umass device scbus device pass device da # I2C (TWSI) device iic device iicbus # SATA device mvs # NAND device nand # Flattened Device Tree -options FDT +options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=db88f6281.dts Index: head/sys/arm/conf/DOCKSTAR =================================================================== --- head/sys/arm/conf/DOCKSTAR (revision 282713) +++ head/sys/arm/conf/DOCKSTAR (revision 282714) @@ -1,168 +1,165 @@ # # Custom kernel for Seagate DockStar (Marvell SheevaPlug based) devices. # # $FreeBSD$ # # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the # FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the # device lines is also present in the ../../conf/NOTES and NOTES files. # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # # $FreeBSD$ # #NO_UNIVERSE ident DOCKSTAR include "std.arm" include "../mv/kirkwood/std.db88f6xxx" -makeoptions FDT_DTS_FILE=dockstar.dts - options SOC_MV_KIRKWOOD options SCHED_4BSD # 4BSD scheduler options INET # InterNETworking options INET6 # IPv6 communications protocols -options SOFTUPDATES -options CD9660 # ISO 9660 filesystem options FFS # Berkeley Fast Filesystem -options TMPFS # Efficient memory filesystem -options MSDOSFS # MS DOS File System (FAT, FAT32) +options SOFTUPDATES # Enable FFS soft updates support +options NFSCL # Network Filesystem Client +options NFSLOCKD # Network Lock Manager +#options NFS_ROOT # NFS usable as /, requires NFSCL +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 filesystem options NULLFS # NULL filesystem +options TMPFS # Efficient memory filesystem +options GEOM_PART_GPT # GUID Partition Tables +options GEOM_PART_BSD # BSD partition scheme +options GEOM_PART_MBR # MBR partition scheme +options GEOM_LABEL # Provides labelization +options GEOM_ELI # Disk encryption 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 GEOM_PART_BSD # BSD partition scheme -options GEOM_PART_MBR # MBR partition scheme -options GEOM_ELI # Disk encryption. -options GEOM_LABEL # Providers labelization. -options GEOM_PART_GPT # GPT partitioning +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -# Flattened Device Tree -device fdt -options FDT -options FDT_DTB_STATIC +# Debugging for use in -current +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +options BREAK_TO_DEBUGGER +options ALT_BREAK_TO_DEBUGGER +options KDB # Enable kernel debugger support +options DDB # Enable the kernel debugger +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 WITNESS_KDB +#options DIAGNOSTIC +# Enable these options for nfs root configured via BOOTP. +#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_WIRED_TO=mge0 + +# If not using BOOTP, use something like one of these... +#options ROOTDEVNAME=\"ufs:/dev/da0a\" +options ROOTDEVNAME=\"ufs:/dev/da0s1a\" +#options ROOTDEVNAME=\"ufs:/dev/da0p10\" +#options ROOTDEVNAME=\"nfs:192.168.0.254/dreamplug\" + # Misc pseudo devices device bpf # Required for DHCP device firmware # firmware(9) required for USB wlan device gif # IPv6 and IPv4 tunneling device loop # Network loopback device md # Memory/malloc disk device pty # BSD-style compatibility pseudo ttys device random # Entropy device device tun # Packet tunnel. device ether # Required for all ethernet devices device vlan # 802.1Q VLAN support device wlan # 802.11 WLAN support # cam support for umass and ahci device scbus device pass device da # Serial ports device uart # Networking device mge # Marvell Gigabit Ethernet controller device mii device e1000phy # USB options USB_HOST_ALIGN=32 # Align DMA to cacheline #options USB_DEBUG # Compile in USB debug support device usb # Basic usb support device ehci # USB host controller device umass # Mass storage device uhid # Human-interface devices device rum # Ralink Technology RT2501USB wireless NICs device uath # Atheros AR5523 wireless NICs device ural # Ralink Technology RT2500USB wireless NICs device zyd # ZyDAS zb1211/zb1211b wireless NICs device urtw # Realtek RTL8187B/L USB device upgt # Conexant/Intersil PrismGT SoftMAC USB device u3g # USB-based 3G modems (Option, Huawei, Sierra) # I2C (TWSI) device iic device iicbus # Sound device sound device snd_uaudio #crypto device cesa # Marvell security engine device crypto device cryptodev # IPSec device enc options IPSEC options IPSEC_NAT_T options TCP_SIGNATURE # include support for RFC 2385 # IPFW options IPFIREWALL options IPFIREWALL_DEFAULT_TO_ACCEPT options IPFIREWALL_VERBOSE options IPFIREWALL_VERBOSE_LIMIT=100 options IPFIREWALL_NAT options LIBALIAS options DUMMYNET options IPDIVERT #PF device pf device pflog device pfsync # ALTQ, required for PF options ALTQ # Basic ALTQ support options ALTQ_CBQ # Class Based Queueing options ALTQ_RED # Random Early Detection options ALTQ_RIO # RED In/Out options ALTQ_HFSC # Hierarchical Packet Scheduler options ALTQ_CDNR # Traffic conditioner options ALTQ_PRIQ # Priority Queueing options ALTQ_NOPCC # Required if the TSC is unusable #options ALTQ_DEBUG -# Debugging -makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -options BREAK_TO_DEBUGGER -options ALT_BREAK_TO_DEBUGGER -options DDB -options KDB -#options DIAGNOSTIC -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 WITNESS_KDB - -# Enable these options for nfs root configured via BOOTP. -options NFSCL # Network Filesystem Client -options NFSLOCKD # Network Lock Manager -#options NFS_ROOT # NFS usable as /, requires NFSCL -#options BOOTP -#options BOOTP_NFSROOT -#options BOOTP_NFSV3 -#options BOOTP_WIRED_TO=mge0 - -# If not using BOOTP, use something like one of these... -#options ROOTDEVNAME=\"ufs:/dev/da0a\" -options ROOTDEVNAME=\"ufs:/dev/da0s1a\" -#options ROOTDEVNAME=\"ufs:/dev/da0p10\" -#options ROOTDEVNAME=\"nfs:192.168.0.254/dreamplug\" - +# Flattened Device Tree +options FDT # Configure using FDT/DTB data +options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=dockstar.dts Index: head/sys/arm/conf/DREAMPLUG-1001 =================================================================== --- head/sys/arm/conf/DREAMPLUG-1001 (revision 282713) +++ head/sys/arm/conf/DREAMPLUG-1001 (revision 282714) @@ -1,184 +1,181 @@ # Kernel config for GlobalScale Technologies DreamPlug version 1001. # # This is for units that are version 10, revision 01, with NOR SPI flash. # These units are identified with the number "1001" on the S/N label. # # For more information on this file, please read the handbook section on # Kernel Configuration Files: # # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the # FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the # latest information. # # An exhaustive list of options and more detailed explanations of the # device lines is also present in the ../../conf/NOTES and NOTES files. # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # # $FreeBSD$ # #NO_UNIVERSE ident DREAMPLUG-1001 include "std.arm" include "../mv/kirkwood/std.db88f6xxx" -makeoptions FDT_DTS_FILE=dreamplug-1001.dts - options SOC_MV_KIRKWOOD options SCHED_4BSD # 4BSD scheduler options INET # InterNETworking options INET6 # IPv6 communications protocols -options SOFTUPDATES -options TMPFS # Efficient memory filesystem -options CD9660 # ISO 9660 filesystem options FFS # Berkeley Fast Filesystem -options MSDOSFS # MS DOS File System (FAT, FAT32) +options SOFTUPDATES # Enable FFS soft updates support +options NFSCL # Network Filesystem Client +options NFSLOCKD # Network Lock Manager +#options NFS_ROOT # NFS usable as /, requires NFSCL +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 filesystem options NULLFS # NULL filesystem +options TMPFS # Efficient memory filesystem +options GEOM_PART_GPT # GUID Partition Tables +options GEOM_PART_BSD # BSD partition scheme +options GEOM_PART_MBR # MBR partition scheme +options GEOM_LABEL # Provides labelization +options GEOM_ELI # Disk encryption 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 GEOM_PART_BSD # BSD partition scheme -options GEOM_PART_MBR # MBR partition scheme -options GEOM_ELI # Disk encryption. -options GEOM_LABEL # Providers labelization. -options GEOM_PART_GPT # GPT partitioning +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -# Flattened Device Tree -device fdt -options FDT -options FDT_DTB_STATIC +# Debugging for use in -current +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +options BREAK_TO_DEBUGGER +options ALT_BREAK_TO_DEBUGGER +options KDB # Enable kernel debugger support +options DDB # Enable the kernel debugger +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 WITNESS_KDB +#options DIAGNOSTIC +# Enable these options for nfs root configured via BOOTP. +#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_WIRED_TO=mge0 + +# If not using BOOTP, use something like one of these... +#options ROOTDEVNAME=\"ufs:/dev/da1a\" +options ROOTDEVNAME=\"ufs:/dev/da1s1a\" +#options ROOTDEVNAME=\"ufs:/dev/da1p10\" +#options ROOTDEVNAME=\"nfs:192.168.0.254/dreamplug\" + # Misc pseudo devices device bpf # Required for DHCP device firmware # firmware(9) required for USB wlan device gif # IPv6 and IPv4 tunneling device loop # Network loopback device md # Memory/malloc disk device pty # BSD-style compatibility pseudo ttys device random # Entropy device device tun # Packet tunnel. device ether # Required for all ethernet devices device vlan # 802.1Q VLAN support device wlan # 802.11 WLAN support # cam support for umass and ahci device scbus device pass device da device cd # Serial ports device uart # Networking device mge # Marvell Gigabit Ethernet controller device mii device e1000phy # USB options USB_HOST_ALIGN=32 # Align DMA to cacheline #options USB_DEBUG # Compile in USB debug support device usb # Basic usb support device ehci # USB host controller device umass # Mass storage device uhid # Human-interface devices device rum # Ralink Technology RT2501USB wireless NICs device uath # Atheros AR5523 wireless NICs device ural # Ralink Technology RT2500USB wireless NICs device zyd # ZyDAS zb1211/zb1211b wireless NICs device urtw # Realtek RTL8187B/L USB device upgt # Conexant/Intersil PrismGT SoftMAC USB device u3g # USB-based 3G modems (Option, Huawei, Sierra) # I2C (TWSI) device iic device iicbus # SATA device mvs device ahci # Sound device sound device snd_uaudio #crypto device cesa # Marvell security engine device crypto device cryptodev # IPSec device enc options IPSEC options IPSEC_NAT_T options TCP_SIGNATURE # include support for RFC 2385 # IPFW options IPFIREWALL options IPFIREWALL_DEFAULT_TO_ACCEPT options IPFIREWALL_VERBOSE options IPFIREWALL_VERBOSE_LIMIT=100 options IPFIREWALL_NAT options LIBALIAS options DUMMYNET options IPDIVERT #PF device pf device pflog device pfsync # ALTQ, required for PF options ALTQ # Basic ALTQ support options ALTQ_CBQ # Class Based Queueing options ALTQ_RED # Random Early Detection options ALTQ_RIO # RED In/Out options ALTQ_HFSC # Hierarchical Packet Scheduler options ALTQ_CDNR # Traffic conditioner options ALTQ_PRIQ # Priority Queueing options ALTQ_NOPCC # Required if the TSC is unusable #options ALTQ_DEBUG -# Debugging -makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -options BREAK_TO_DEBUGGER -options ALT_BREAK_TO_DEBUGGER -options DDB -options KDB -#options DIAGNOSTIC -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 WITNESS_KDB - -# Enable these options for nfs root configured via BOOTP. -options NFSCL # Network Filesystem Client -options NFSLOCKD # Network Lock Manager -#options NFS_ROOT # NFS usable as /, requires NFSCL -#options BOOTP -#options BOOTP_NFSROOT -#options BOOTP_NFSV3 -#options BOOTP_WIRED_TO=mge0 - -# If not using BOOTP, use something like one of these... -#options ROOTDEVNAME=\"ufs:/dev/da1a\" -options ROOTDEVNAME=\"ufs:/dev/da1s1a\" -#options ROOTDEVNAME=\"ufs:/dev/da1p10\" -#options ROOTDEVNAME=\"nfs:192.168.0.254/dreamplug\" - # To use this configuration with the (rare) model 1001N (nand flash), # create a kernel config file that looks like this: # # include DREAMPLUG-1001 # nomakeoptions FDT_DTS_FILE # makeoptions FDT_DTS_FILE=dreamplug-1001N.dts # device nand +# Flattened Device Tree +options FDT # Configure using FDT/DTB data +options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=dreamplug-1001.dts Index: head/sys/arm/conf/SHEEVAPLUG =================================================================== --- head/sys/arm/conf/SHEEVAPLUG (revision 282713) +++ head/sys/arm/conf/SHEEVAPLUG (revision 282714) @@ -1,86 +1,87 @@ # # Custom kernel for Marvell SheevaPlug devices. # # $FreeBSD$ # #NO_UNIVERSE ident SHEEVAPLUG include "std.arm" include "../mv/kirkwood/std.db88f6xxx" options SOC_MV_KIRKWOOD -#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" +options HZ=1000 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 NANDFS # NAND Filesystem options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=mge0 - -# Root fs on USB device -#options ROOTDEVNAME=\"ufs:/dev/da0a\" - +options TMPFS # Efficient memory filesystem +options GEOM_PART_BSD # BSD partition scheme +options GEOM_PART_MBR # MBR partition scheme 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 _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options MUTEX_NOINLINE options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING -# Debugging +# Debugging for use in -current +#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options ALT_BREAK_TO_DEBUGGER -options DDB -options KDB +options KDB # Enable kernel debugger support +options DDB # Enable the kernel debugger +# NFS root from boopt/dhcp +options BOOTP +options BOOTP_NFSROOT +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=mge0 + +# Root fs on USB device +#options ROOTDEVNAME=\"ufs:/dev/da0a\" + # Pseudo devices -device random device loop +device random # Serial ports device uart # Networking device ether device mge # Marvell Gigabit Ethernet controller device mii device e1000phy device bpf -options HZ=1000 options DEVICE_POLLING device vlan device cesa # Marvell security engine device crypto device cryptodev # USB options USB_DEBUG # enable debug msgs device usb device ehci device umass device scbus device pass device da # NAND device nand # Flattened Device Tree -options FDT +options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=sheevaplug.dts