Index: head/sys/arm/conf/ATMEL
===================================================================
--- head/sys/arm/conf/ATMEL	(revision 296937)
+++ head/sys/arm/conf/ATMEL	(revision 296938)
@@ -1,182 +1,177 @@
 # Kernel configuration to test compile all the atmel bits with one
 # configuration.  This kernel will not (presently) boot.  Do not copy
 # it to create your own custom config file.
 #
 # $FreeBSD$
 
 ident		ATMEL
 
 include 	"std.arm"
 include 	"../at91/std.atmel"
 
 # Typical values for most SoCs and board configurations.  Will not work for
 # at91sam9g45 or on some boards with non u-boot boot loaders.
 makeoptions	KERNPHYSADDR=0x20000000
 makeoptions	KERNVIRTADDR=0xc0000000
 options 	KERNVIRTADDR=0xc0000000
 
 makeoptions	MODULES_OVERRIDE="dtb/atmel"
 
 # list all boards here, but not just yet (no multiboard in mainline).
 options 	ARM_MANY_BOARD
 device		at91_board_bwct
 device		at91_board_ethernut5
 device		at91_board_hl200
 device		at91_board_hl201
 device		at91_board_kb920x
 device		at91_board_qila9g20
 device		at91_board_sam9260ek
 device		at91_board_sam9g20ek
 device		at91_board_sam9x25ek
 device		at91_board_sn9g45
 device		at91_board_tsc4370
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	SCTP			# Stream Control Transmission Protocol
 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 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# Network Filesystem Client
 options 	NFSD			# Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	TMPFS			# Efficient memory filesystem
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
-options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
-options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
-options 	COMPAT_FREEBSD9		# Compatible with FreeBSD9
-options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	STACK			# stack(9) 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 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 #options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 #options 	AUDIT			# Security event auditing
 #options 	CAPABILITY_MODE		# Capsicum capability mode
 #options 	CAPABILITIES		# Capsicum capabilities
 #options 	MAC			# TrustedBSD MAC Framework
 #options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
 # Debugging support.  Always need this:
 options 	KDB			# Enable kernel debugger support
 # For minimum debugger support (stable branch) use:
 options 	KDB_TRACE		# Print a stack trace for a panic
 # For full debugger support use this instead:
 options 	DDB			# Enable the kernel debugger
 options 	GDB			# Support remote GDB
 #options 	DEADLKRES		# Enable the deadlock resolver
 #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 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
 # NFS root from boopt/dhcp
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_COMPAT
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=ate0
 
 # alternatively, boot from a MMC/SD memory card
 #options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0a\"
 
 # kernel/memory size reduction
 options 	MUTEX_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 options 	NO_SYSCTL_DESCR
 options 	RWLOCK_NOINLINE
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
 device		bpf			# Berkeley packet filter
 
 # Ethernet
 device		mii			# Minimal MII support
 device		ate			# Atmel AT91 Ethernet driver
 
 # I2C
 device		at91_twi		# Atmel AT91 Two-wire Interface
 device		iic			# I2C generic I/O device driver
 device		iicbus			# I2C bus system
 device		pcf8563			# NXP PCF8563 clock/calendar
 
 # MMC/SD
 device		at91_mci		# Atmel AT91 Multimedia Card Interface
 options 	AT91_MCI_HAS_4WIRE
 device		mmc			# MMC/SD bus
 device		mmcsd			# MMC/SD memory card
 
 # DataFlash
 device		at91_spi		# Atmel AT91 Serial Peripheral Interface
 device		spibus			# SPI bus
 device		at45d			# Atmel AT45D
 device		geom_map		# GEOM partition mapping
 
 # Pseudo devices.
 device		loop			# Network loopback
 device		random			# Entropy device
 device		ether			# Ethernet support
 device		vlan			# 802.1Q VLAN support
 device		tun			# Packet tunnel.
 device		md			# Memory "disks"
 device		gif			# IPv6 and IPv4 tunneling
 #device		firmware		# firmware assist module
 
 # SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		ch			# SCSI media changers
 device		da			# Direct Access (disks)
 device		sa			# Sequential Access (tape etc)
 device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 device		ses			# Enclosure Services (SES and SAF-TE)
 #device		ctl			# CAM Target Layer
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
 options 	ALT_BREAK_TO_DEBUGGER
 
 # USB support
 options 	USB_DEBUG		# enable debug msgs
 device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # USB device (gadget) support
 device		at91_dci		# Atmel's usb device
 device		usfs			# emulate a flash
 device		cdce			# emulate an ethernet
 device		usb_template		# Control of the gadget
 
 # watchdog
 device		at91_wdt		# Atmel AT91 Watchdog Timer
 
 device		at91_rtc
 device		at91_ssc
 #device		at91_tc			# missing?
 
 # NAND Flash - Reference design has Samsung 256MB but others possible
 device		nand			# NAND interface on CS3
Index: head/sys/arm/conf/CNS11XXNAS
===================================================================
--- head/sys/arm/conf/CNS11XXNAS	(revision 296937)
+++ head/sys/arm/conf/CNS11XXNAS	(revision 296938)
@@ -1,125 +1,120 @@
 # CNS11XXNAS -  StarSemi STR9104/Cavium CNS1102 NAS
 # kernel configuration file for FreeBSD/arm
 #
 # 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$
 
 ident		CNS11XXNAS
 
 include 	"std.arm"
 #options 	PHYSADDR=0x10000000
 #options 	KERNVIRTADDR=0xc0200000	# Used in ldscript.arm
 #options 	FLASHADDR=0x50000000
 #options 	LOADERRAMADDR=0x00000000
 
 include 	"../cavium/cns11xx/std.econa"
 
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	HZ=100
 options 	DEVICE_POLLING
 
 # Debugging for use in -current
 options 	KDB
 #options 	GDB
 options 	DDB			# Enable the kernel debugger
 #options 	DEADLKRES		# Enable the deadlock resolver
 #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 	DIAGNOSTIC
 
 
-#options 	COMPAT_FREEBSD5
-#options 	COMPAT_FREEBSD6
-#options 	COMPAT_FREEBSD7n
-
-
 options 	SCHED_ULE		# ULE scheduler
 #options 	SCHED_4BSD		# 4BSD scheduler
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 #options 	GEOM_PART_EBR
 #options 	GEOM_PART_EBR_COMPAT
 options 	GEOM_LABEL		# Provides labelization
 
 
 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 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 #options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	TMPFS			# Efficient memory filesystem
 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 	MUTEX_NOINLINE		# Mutex inlines are space hogs
 options 	RWLOCK_NOINLINE		# rwlock inlines are space hogs
 options 	SX_NOINLINE		# sx inliens are space hogs
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=npe0
 #options 	BOOTP_COMPAT
 
 #device		pci
 device		uart
 
 
 device		firmware
 device		mii			# Minimal mii routines
 device		ether
 device		bpf
 
 device		loop
 
 device		md
 device		random			# Entropy device
 
 
 device		usb
 #options 	USB_DEBUG
 device		ohci
 device		ehci
 device		umass
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 device		cfi
 
 #device		udav			# Davicom DM9601E USB
 
 device		geom_label
 device		geom_journal
 device		geom_part_bsd
 
 options 	ROOTDEVNAME=\"ufs:da0s1a\"
Index: head/sys/arm/conf/EFIKA_MX
===================================================================
--- head/sys/arm/conf/EFIKA_MX	(revision 296937)
+++ head/sys/arm/conf/EFIKA_MX	(revision 296938)
@@ -1,153 +1,150 @@
 #
 # Kernel configuration for Efika MX Smarttop/Smartbook boards
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or 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$
 
 ident		EFIKA_MX
 
 include 	"std.armv6"
 include 	"../freescale/imx/std.imx51"
 
 makeoptions	WITHOUT_MODULES="ahc"
 
 options 	SOC_IMX51
 
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	MD_ROOT			# MD is a potential root device
 #options 	NFSD			# Network Filesystem Server
-#options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-#options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
-#options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	PLATFORM
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	ALT_BREAK_TO_DEBUGGER
 #options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
 options 	KDB			# Enable kernel debugger support
 # For minimum debugger support (stable branch) use:
 #options 	KDB_TRACE		# Print a stack trace for a panic
 # For full debugger support use this instead:
 options 	DDB			# Enable the kernel debugger
 #options 	GDB			# Support remote GDB
 options 	DEADLKRES		# Enable the deadlock resolver
 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
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
 options 	ROOTDEVNAME=\"ufs:ada0s2a\"
 
 
 # kernel/memory size reduction
 #options 	MUTEX_NOINLINE
 #options 	NO_FFS_SNAPSHOT
 #options 	NO_SWAPPING
 #options 	NO_SYSCTL_DESCR
 #options 	RWLOCK_NOINLINE
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
 device		bpf			# Berkeley packet filter
 
 # Pseudo devices.
 device		loop			# Network loopback
 device		random			# Entropy device
 device		ether			# Ethernet support
 #device		vlan			# 802.1Q VLAN support
 #device		tun			# Packet tunnel.
 #device		md			# Memory "disks"
 #device		gif			# IPv6 and IPv4 tunneling
 #device		firmware		# firmware assist module
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
 options 	ALT_BREAK_TO_DEBUGGER
 
 device		ata
 device		atapci			# Only for helper functions
 device		imxata
 
 device		gpio
 device		gpioled
 
 device		fsliic
 device		iic
 device		iicbus
 
 # SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 #options 	USB_DEBUG		# enable debug msgs
 device		ehci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		uhid			# "Human Interface Devices"
 device		u3g
 
 # USB Ethernet, requires miibus
 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
 
 # USB Wireless
 device		rum			# Ralink Technology RT2501USB wireless NICs
 
 # Watchdog timer.
 # WARNING: can't be disabled!!!
 device		imxwdt			# Watchdog
 
 # Wireless NIC cards
 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
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=efikamx.dts
 
 # NOTE: serial console will be disabled if syscons enabled
 # Uncomment following lines for framebuffer/syscons support
 device		sc
 device		kbdmux
 options 	SC_DFLT_FONT		# compile font in
 makeoptions	SC_DFLT_FONT=cp437
 device		ukbd			# Allow keyboard like HIDs to control console
 device		ums
Index: head/sys/arm/conf/ETHERNUT5
===================================================================
--- head/sys/arm/conf/ETHERNUT5	(revision 296937)
+++ head/sys/arm/conf/ETHERNUT5	(revision 296938)
@@ -1,163 +1,160 @@
 # Kernel configuration for Ethernut 5 boards
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or 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		ETHERNUT5
 
 include 	"std.arm"
 include 	"../at91/std.ethernut5"
 
 # To statically compile in device wiring instead of /boot/device.hints
 hints		"ETHERNUT5.hints"
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 #options 	INET6			# IPv6 communications protocols
 #options 	SCTP			# Stream Control Transmission Protocol
 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 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
 #options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	TMPFS			# Efficient memory filesystem
 #options 	MSDOSFS			# MSDOS Filesystem
 #options 	CD9660			# ISO 9660 Filesystem
 #options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 #options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 #options 	GEOM_PART_GPT		# GUID Partition Tables.
 #options 	GEOM_LABEL		# Provides labelization
-#options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-#options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
-#options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 #options 	STACK			# stack(9) 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 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 #options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 #options 	AUDIT			# Security event auditing
 #options 	CAPABILITY_MODE		# Capsicum capability mode
 #options 	CAPABILITIES		# Capsicum capabilities
 #options 	MAC			# TrustedBSD MAC Framework
 #options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
 # Debugging support.  Always need this:
 #options 	KDB			# Enable kernel debugger support.
 # For minimum debugger support (stable branch) use:
 #options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use this instead:
 #options 	DDB			# Enable the kernel debugger
 #options 	GDB			# Support remote GDB
 #options 	DEADLKRES		# Enable the deadlock resolver
 #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 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
 # NFS root from boopt/dhcp
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_COMPAT
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=ate0
 
 # alternatively, boot from a MMC/SD memory card
 #options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0a\"
 
 # kernel/memory size reduction
 options 	MUTEX_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 options 	NO_SYSCTL_DESCR
 options 	RWLOCK_NOINLINE
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
 device		bpf			# Berkeley packet filter
 
 # Ethernet
 device		mii			# Minimal MII support
 device		ate			# Atmel AT91 Ethernet driver
 
 # I2C
 device		at91_twi		# Atmel AT91 Two-wire Interface
 device		iic			# I2C generic I/O device driver
 device		iicbus			# I2C bus system
 device		pcf8563			# NXP PCF8563 clock/calendar
 
 # MMC/SD
 device		at91_mci		# Atmel AT91 Multimedia Card Interface
 options 	AT91_MCI_HAS_4WIRE
 device		mmc			# MMC/SD bus
 device		mmcsd			# MMC/SD memory card
 
 # DataFlash
 device		at91_spi		# Atmel AT91 Serial Peripheral Interface
 device		spibus			# SPI bus
 device		at45d			# Atmel AT45D
 device		geom_map		# GEOM partition mapping
 
 # Pseudo devices.
 device		loop			# Network loopback
 device		random			# Entropy device
 device		ether			# Ethernet support
 #device		vlan			# 802.1Q VLAN support
 #device		tun			# Packet tunnel.
 #device		md			# Memory "disks"
 #device		gif			# IPv6 and IPv4 tunneling
 #device		firmware		# firmware assist module
 
 # SCSI peripherals
 #device		scbus			# SCSI bus (required for ATA/SCSI)
 #device		ch			# SCSI media changers
 #device		da			# Direct Access (disks)
 #device		sa			# Sequential Access (tape etc)
 #device		cd			# CD
 #device		pass			# Passthrough device (direct ATA/SCSI access)
 #device		ses			# Enclosure Services (SES and SAF-TE)
 #device		ctl			# CAM Target Layer
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
 options 	ALT_BREAK_TO_DEBUGGER
 
 # USB support
 #options 	USB_DEBUG		# enable debug msgs
 device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 #device		umass			# Disks/Mass storage - Requires scbus and da
 
 # watchdog
 device		at91_wdt		# Atmel AT91 Watchdog Timer
Index: head/sys/arm/conf/IMX53
===================================================================
--- head/sys/arm/conf/IMX53	(revision 296937)
+++ head/sys/arm/conf/IMX53	(revision 296938)
@@ -1,138 +1,135 @@
 #
 # Kernel configuration for i.MX53 boards
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or 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$
 
 ident		IMX53
 
 include 	"std.armv6"
 include 	"../freescale/imx/std.imx53"
 
 options 	SOC_IMX53
 
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	NFSD			# Network Filesystem Server
-#options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-#options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
-#options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	PLATFORM
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	KDB			# Enable kernel debugger support
 # For minimum debugger support (stable branch) use:
 #options 	KDB_TRACE		# Print a stack trace for a panic
 # For full debugger support use this instead:
 options 	DDB			# Enable the kernel debugger
 #options 	GDB			# Support remote GDB
 options 	DEADLKRES		# Enable the deadlock resolver
 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
 
 # kernel/memory size reduction
 #options 	MUTEX_NOINLINE
 #options 	NO_FFS_SNAPSHOT
 #options 	NO_SWAPPING
 #options 	NO_SYSCTL_DESCR
 #options 	RWLOCK_NOINLINE
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
 device		bpf			# Berkeley packet filter
 
 # Pseudo devices.
 device		loop			# Network loopback
 device		random			# Entropy device
 device		ether			# Ethernet support
 #device		vlan			# 802.1Q VLAN support
 #device		tun			# Packet tunnel.
 device		md			# Memory "disks"
 #device		gif			# IPv6 and IPv4 tunneling
 #device		firmware		# firmware assist module
 
 # Ethernet
 device		ffec			# Freescale Fast Ethernet Controller
 device		miibus			# Standard mii bus
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
 options 	ALT_BREAK_TO_DEBUGGER
 
 device		ata
 device		atapci			# Only for helper functions
 device		imxata
 
 device		gpio
 device		gpioled
 
 device		fsliic
 device		iic
 device		iicbus
 
 # SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 options 	USB_DEBUG		# enable debug msgs
 device		ehci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		uhid			# "Human Interface Devices"
 #device		ukbd			# Allow keyboard like HIDs to control console
 device		ums
 
 # USB Ethernet, requires miibus
 #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
 
 # USB Wireless
 #device		rum			# Ralink Technology RT2501USB wireless NICs
 
 # Watchdog timer.
 # WARNING: can't be disabled!!!
 device		imxwdt			# Watchdog
 
 # Wireless NIC cards
 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
 
 # MMC
 #device  	sdhci			# SD controller
 #device  	mmc			# SD/MMC protocol
 #device  	mmcsd			# SDCard disk device
 
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
Index: head/sys/arm/conf/NOTES
===================================================================
--- head/sys/arm/conf/NOTES	(revision 296937)
+++ head/sys/arm/conf/NOTES	(revision 296938)
@@ -1,105 +1,109 @@
 # $FreeBSD$
 
 machine	arm
 
 cpu	CPU_ARM9
 cpu	CPU_ARM9E
 cpu	CPU_FA526
 cpu 	CPU_XSCALE_81342
 cpu 	CPU_XSCALE_IXP425
 cpu 	CPU_XSCALE_IXP435
 cpu	CPU_XSCALE_PXA2X0
 
 files	"../at91/files.at91"
 files	"../cavium/cns11xx/files.econa"
 files	"../mv/files.mv"
 files	"../mv/discovery/files.db78xxx"
 files	"../mv/kirkwood/files.kirkwood"
 files	"../mv/orion/files.db88f5xxx"
 files	"../mv/orion/files.ts7800"
 files	"../xscale/i8134x/files.crb"
 files	"../xscale/i8134x/files.i81342"
 files	"../xscale/ixp425/files.avila"
 files	"../xscale/ixp425/files.ixp425"
 files	"../xscale/pxa/files.pxa"
 
 options 	PHYSADDR=0x00000000
 options 	KERNVIRTADDR=0xc0000000
 
 makeoptions	LDFLAGS="-zmuldefs"
 makeoptions	KERNPHYSADDR=0x00000000
 makeoptions	KERNVIRTADDR=0xc0000000
 
 options 	FDT
 
 options 	SOC_MV_DISCOVERY
 options 	SOC_MV_KIRKWOOD
 options 	SOC_MV_ORION
 
 device		pci
 
 device		at91_board_bwct
 device		at91_board_ethernut5
 device		at91_board_hl200
 device		at91_board_hl201
 device		at91_board_kb920x
 device		at91_board_qila9g20
 device		at91_board_sam9260ek
 device		at91_board_sam9g20ek
 device		at91_board_sam9x25ek
 device		at91_board_tsc4370
 device		at91rm9200
 device		nand
 
 # IIC
 device		twsi
 
 nooptions	SMP
 nooptions	MAXCPU
 
 nooptions	COMPAT_FREEBSD4
+nooptions	COMPAT_FREEBSD5
+nooptions	COMPAT_FREEBSD6
+nooptions	COMPAT_FREEBSD7
+nooptions	COMPAT_FREEBSD9
 nooption	PPC_PROBE_CHIPSET
 
 nodevice	fdc
 nodevice	sym
 nodevice	ukbd
 
 nodevice	sc
 nodevice	blank_saver
 nodevice	daemon_saver
 nodevice	dragon_saver
 nodevice	fade_saver
 nodevice	fire_saver
 nodevice	green_saver
 nodevice	logo_saver
 nodevice	rain_saver
 nodevice	snake_saver
 nodevice	star_saver
 nodevice	warp_saver
 
 nodevice	cxgbe
 nodevice	pcii
 nodevice	snd_cmi
 nodevice	tnt4882
 
 #
 # Enable the kernel DTrace hooks which are required to load the DTrace
 # kernel modules.
 #
 options 	KDTRACE_HOOKS
 
 # DTrace core
 # NOTE: introduces CDDL-licensed components into the kernel
 #device		dtrace
 
 # DTrace modules
 #device		dtrace_profile
 #device		dtrace_sdt
 #device		dtrace_fbt
 #device		dtrace_systrace
 #device		dtrace_prototype
 #device		dtnfscl
 #device		dtmalloc
 
 # Alternatively include all the DTrace modules
 #device		dtraceall
Index: head/sys/arm/conf/SAM9260EK
===================================================================
--- head/sys/arm/conf/SAM9260EK	(revision 296937)
+++ head/sys/arm/conf/SAM9260EK	(revision 296938)
@@ -1,204 +1,201 @@
 # Kernel configuration for Atmel SAM9260-EK eval board
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or 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		SAM9260EK
 
 include 	"std.arm"
 include 	"../at91/std.sam9260ek"
 
 # Coming soon, but not yet
 #options 	FDT
 #options 	FDT_DTB_STATIC
 #makeoptions	FDT_DTS_FILE=sam9260ek.dts
 
 options 	EARLY_PRINTF
 options 	SOCDEV_PA=0xfc000000
 options 	SOCDEV_VA=0xdc000000
 
 # To statically compile in device wiring instead of /boot/device.hints
 hints		"SAM9260EK.hints"
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	MODULES_OVERRIDE=""
 
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 #options 	INET6			# IPv6 communications protocols
 #options 	SCTP			# Stream Control Transmission Protocol
 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 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
 #options 	MD_ROOT			# MD is a potential root device
 options 	NANDFS			# NAND file system
 options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	TMPFS			# Efficient memory filesystem
 #options 	MSDOSFS			# MSDOS Filesystem
 #options 	CD9660			# ISO 9660 Filesystem
 #options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 #options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 #options 	GEOM_PART_GPT		# GUID Partition Tables.
 #options 	GEOM_LABEL		# Provides labelization
-#options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
-#options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
-#options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 #options 	STACK			# stack(9) 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 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 #options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 #options 	AUDIT			# Security event auditing
 #options 	CAPABILITY_MODE		# Capsicum capability mode
 #options 	CAPABILITIES		# Capsicum capabilities
 #options 	MAC			# TrustedBSD MAC Framework
 #options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
 # Debugging support.  Always need this:
 #options 	KDB			# Enable kernel debugger support
 # For minimum debugger support (stable branch) use:
 #options 	KDB_TRACE		# Print a stack trace for a panic
 # For full debugger support use this instead:
 #options 	DDB			# Enable the kernel debugger
 #options 	GDB			# Support remote GDB
 #options 	DEADLKRES		# Enable the deadlock resolver
 #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 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=macb0
 
 # s3 because s1 is reserved for the DOS parittions sometimes needed to
 # boot off SD cards on the G20 and newer chips. s2 is reserved for
 # nanobsd's config partition. s3 and s4 are for the ping-pong upgrade
 # path. 9260 doesn't boot off SD, but let's keep things sane.
 options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s3a\"
 
 # Alternatively, boot from a USB card.
 #options 	ROOTDEVNAME=\"ufs:/dev/da0s1a\"
 
 # kernel/memory size reduction
 options 	MUTEX_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 options 	NO_SYSCTL_DESCR
 options 	RWLOCK_NOINLINE
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
 device		bpf			# Berkeley packet filter
 
 # Ethernet
 device		mii			# Minimal MII support
 device		macb			# Atmel AT91 Ethernet driver
 
 # I2C
 device		at91_twi		# Atmel AT91 Two-wire Interface
 device		iic			# I2C generic I/O device driver
 device		iicbus			# I2C bus system
 device		icee			# I2C eeprom
 
 # MMC/SD
 # See comment for DataFlash below
 device		at91_mci		# Atmel AT91 Multimedia Card Interface
 options 	AT91_MCI_HAS_4WIRE	# 4 wires
 options 	AT91_MCI_SLOT_B		# Wired to slot B
 device		mmc			# MMC/SD bus
 device		mmcsd			# MMC/SD memory card
 
 # DataFlash
 # The DataFlash and MMC card are wired together, so we must pick one or the
 # other.  This is due to pin mux, and also due to the design of the
 # SAM9260EK board.  SLOT A wouldn't have this issue.
 #device		at91_spi		# Atmel AT91 Serial Peripheral Interface
 #device		spibus			# SPI bus
 #device		at45d			# Atmel AT45D
 #device		geom_map		# GEOM partition mapping
 
 # Pseudo devices.
 device		loop			# Network loopback
 device		random			# Entropy device
 device		ether			# Ethernet support
 #device		vlan			# 802.1Q VLAN support
 #device		tun			# Packet tunnel.
 device		md			# Memory "disks"
 #device		gif			# IPv6 and IPv4 tunneling
 #device		firmware		# firmware assist module
 
 # SCSI peripherals
 #device		scbus			# SCSI bus (required for ATA/SCSI)
 #device		ch			# SCSI media changers
 #device		da			# Direct Access (disks)
 #device		sa			# Sequential Access (tape etc)
 #device		cd			# CD/DVD
 #device		pass			# Passthrough device (direct ATA/SCSI access)
 #device		ses			# Enclosure Services (SES and SAF-TE)
 #device		ctl			# CAM Target Layer
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
 options 	ALT_BREAK_TO_DEBUGGER
 
 # USB support
 #options 	USB_DEBUG		# enable debug msgs
 #device		ohci			# OHCI USB interface
 #device		usb			# USB Bus (required)
 #device		umass			# Disks/Mass storage - Requires scbus and da
 
 # watchdog
 device		at91_wdt		# Atmel AT91 Watchdog Timer
 
 # NAND Flash - Reference design has Samsung 256MB but others possible
 device		nand			# NAND interface on CS3
 
 options		NSFBUFS=128
 maxusers	32
 
 # Limit IO size
 options		NBUF=128
 
 # Don't include the SCSI/CAM strings in the default build
 options 	SCSI_NO_SENSE_STRINGS
 options 	SCSI_NO_OP_STRINGS
 
 # .. And no sysctl strings
 options 	NO_SYSCTL_DESCR
 
 # For small memory footprints
 options		VM_KMEM_SIZE_SCALE=1
Index: head/sys/arm/conf/std.arm
===================================================================
--- head/sys/arm/conf/std.arm	(revision 296937)
+++ head/sys/arm/conf/std.arm	(revision 296938)
@@ -1,5 +1,6 @@
 # Standard kernel config items for all ARMv4/v5 systems.
 #
 # $FreeBSD$
 
+options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 
Index: head/sys/arm/conf/std.armv6
===================================================================
--- head/sys/arm/conf/std.armv6	(revision 296937)
+++ head/sys/arm/conf/std.armv6	(revision 296938)
@@ -1,45 +1,47 @@
 # Standard kernel config items for all ARMv6/v7 systems.
 #
 # $FreeBSD$
 
 options 	ARM_L2_PIPT		# Only L2 PIPT is supported
 
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
 options 	SCTP			# Stream Control Transmission Protocol
 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 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
 options 	QUOTA			# Enable disk quotas for UFS
 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 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 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 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 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 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
 
+options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
+
 # DTrace support
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# all architectures - kernel ELF linker loads CTF data
 makeoptions	WITH_CTF=1