Index: head/sys/arm/conf/A10
===================================================================
--- head/sys/arm/conf/A10	(revision 302505)
+++ head/sys/arm/conf/A10	(revision 302506)
@@ -1,110 +1,109 @@
 #
 # A10 -- Custom configuration for the AllWinner A10 SoC
 #
 # 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		A10
 
 include 	"std.armv6"
 include 	"../allwinner/std.a10"
 
 options 	INTRNG
 
 options 	SOC_ALLWINNER_A10
 options 	SOC_ALLWINNER_A13
 
-options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 options 	MULTIDELAY
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=emac0
 
 # EXT_RESOURCES pseudo devices
 options		EXT_RESOURCES
 device		clk
 device		phy
 device		hwreset
 device		regulator
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 
 # ATA controllers
 device		ahci			# AHCI-compatible SATA controllers
 #device		ata			# Legacy ATA/SATA controllers
 
 # Console and misc
 device		uart
 device		uart_snps
 device		pty
 device		snp
 device		md
 device		random			# Entropy device
 
 # I2C support
 device		iicbus
 device		iic
 device		twsi
 device		axp209			# AXP209 Power Management Unit
 
 device		pcf8563			# RTC
 
 # GPIO
 device		gpio
 device		gpioled
 
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 #device		uhci
 device		ohci
 device		ehci
 
 device		umass
 
 # Ethernet
 device		loop
 device		ether
 device		mii
 device		bpf
 
 device		emac
 
 # USB ethernet support, requires miibus
 device		miibus
 
 # Sound support
 device		sound
 
 # Pinmux
 device		fdt_pinctrl
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 makeoptions	MODULES_EXTRA=dtb/allwinner
Index: head/sys/arm/conf/ALLWINNER
===================================================================
--- head/sys/arm/conf/ALLWINNER	(revision 302505)
+++ head/sys/arm/conf/ALLWINNER	(revision 302506)
@@ -1,132 +1,131 @@
 #
 # ALLWINNER -- Custom configuration for the Allwinner A20, A31, A31S, A83T,
 # and H3 ARM SoCs.
 #
 # 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		ALLWINNER
 
 include 	"std.armv6"
 include 	"../allwinner/std.allwinner"
 
 options 	INTRNG
 
 options 	SOC_ALLWINNER_A20
 options 	SOC_ALLWINNER_A31
 options 	SOC_ALLWINNER_A31S
 options 	SOC_ALLWINNER_A83T
 options 	SOC_ALLWINNER_H3
 
-options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 options 	PLATFORM
 options 	PLATFORM_SMP
 options 	MULTIDELAY
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=dwc0
 
 # EXT_RESOURCES pseudo devices
 options 	EXT_RESOURCES
 device		clk
 device		phy
 device		hwreset
 device		regulator
 
 # Interrupt controller
 device		gic
 
 # ARM Generic Timer
 device		generic_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 
 # ATA controllers
 device		ahci			# AHCI-compatible SATA controllers
 #device		ata			# Legacy ATA/SATA controllers
 
 # Console and misc
 device		uart
 device		uart_snps
 device		pty
 device		snp
 device		md
 device		random			# Entropy device
 
 # I2C support
 device		iicbus
 device		iic
 device		twsi
 device		rsb
 device		axp209			# AXP209 Power Management Unit
 device		axp81x			# AXP813/818 Power Management Unit
 
 # GPIO
 device		gpio
 device		gpioled
 
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 #device		uhci
 device		ohci
 device		ehci
 
 device		umass
 
 # Ethernet
 device		loop
 device		ether
 device		mii
 device		bpf
 
 #device		emac			# 10/100 integrated EMAC controller
 device		dwc			# 10/100/1000 integrated GMAC controller
 device		awg			# 10/100/1000 integrated EMAC controller
 
 # USB ethernet support, requires miibus
 device		miibus
 
 # Sound support
 device		sound
 
 # Framebuffer support
 device		vt
 device		kbdmux
 device		ums
 device		ukbd
 device		videomode
 device		hdmi
 
 # Pinmux
 device		fdt_pinctrl
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 makeoptions	MODULES_EXTRA=dtb/allwinner
Index: head/sys/arm/conf/ALPINE
===================================================================
--- head/sys/arm/conf/ALPINE	(revision 302505)
+++ head/sys/arm/conf/ALPINE	(revision 302506)
@@ -1,72 +1,71 @@
 # Kernel configuration for Alpine 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$
 
 ident		ALPINE
 
 include 	"std.armv6"
 include 	"../annapurna/alpine/std.alpine"
 
 makeoptions	MODULES_OVERRIDE=""
 makeoptions	WERROR="-Werror"
 
-options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	SMP			# Enable multiple cores
 
 # Interrupt controller
 device		gic
 options 	INTRNG
 
 # Pseudo devices
 device		loop
 device		random
 device		pty
 device		md
 device		gpio
 
 # ATA controllers
 device		ahci		# AHCI-compatible SATA controllers
 device		ata		# Legacy ATA/SATA controllers
 
 # ATA/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 ports
 device		uart
 
 # Ethernet
 device		ether
 device		mii
 device		bpf
 options 	DEVICE_POLLING
 
 # USB ethernet support, requires miibus
 device		miibus
 
 #FDT
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=annapurna-alpine.dts
Index: head/sys/arm/conf/AML8726
===================================================================
--- head/sys/arm/conf/AML8726	(revision 302505)
+++ head/sys/arm/conf/AML8726	(revision 302506)
@@ -1,99 +1,98 @@
 #
 # Kernel configuration for Amlogic aml8726 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		AML8726
 
 include 	"std.armv6"
 include 	"../amlogic/aml8726/std.aml8726"
 
-options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	LINUX_BOOT_ABI
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=axe0
 
 # Interrupt controller
 device		aml_pic
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 
 # Boot device is 2nd slice on MMC/SD card
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
 device		pl310			# PL310 L2 cache controller
 
 # GPIO
 device		gpio
 device		gpioled
 
 # I2C support
 device		iicbus
 device		iicbb
 device		iic
 
 # vt is the default console driver, resembling an SCO console
 device		vt
 #device		kbdmux
 
 # Serial (COM) ports
 device		uart			# Generic UART driver
 
 # Pseudo devices.
 device		loop			# Network loopback
 device		random			# Entropy device
 device		ether			# Ethernet support
 device		pty			# BSD-style compatibility pseudo ttys
 
 # 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
 
 # USB support
 device		usb			# General USB code (mandatory for USB)
 device		dwcotg			# DWC OTG controller
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 
 #device		ukbd			# USB keyboard
 #device		ums			# USB mouse
 
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # Ethernet support
 device		miibus			# MII bus support
 
 # SoC Ethernet, requires miibus
 device		dwc
 
 # USB Ethernet support, requires miibus
 device		axe			# ASIX Electronics USB Ethernet
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
Index: head/sys/arm/conf/ARMADA38X
===================================================================
--- head/sys/arm/conf/ARMADA38X	(revision 302505)
+++ head/sys/arm/conf/ARMADA38X	(revision 302506)
@@ -1,75 +1,73 @@
 #
 # Kernel configuration for Marvell Armada38x
 #
 # $FreeBSD$
 #
 
 include 	"../mv/armada38x/std.armada38x"
 include 	"std.armv6"
 
 ident 	ARMADA38X
 
 options 	SOC_MV_ARMADA38X
 
 makeoptions 	WERROR="-Werror"
 
 options 	MD_ROOT
 #makeoptions 	MFS_IMAGE=/path/to/miniroot
 #options 	ROOTDEVNAME=\"ufs:md0\"
 options 	ROOTDEVNAME=\"/dev/da0s1a\"
 
 options 	SCHED_ULE		# ULE scheduler
-#options 	SCHED_4BSD		# 4BSD scheduler
-
 options 	SMP
 
 # Pseudo devices
 device		random
 device		pty
 device		loop
 device		md
 
 # Serial ports
 device		uart
 device		uart_snps
 
 # Network
 device		ether
 device		vlan
 device		mii
 device		bpf
 device		re
 
 # PCI
 device		pci
 
 # Interrupt controllers
 device		gic
 options 	INTRNG
 
 # Timers
 device		mpcore_timer
 
 # USB
 device		usb
 device		ehci
 device		xhci
 device		umass
 device		scbus
 device		pass
 device		da
 
 # I2C
 device		iic
 device		iicbus
 device		twsi
 
 # CESA
 device		cesa
 device		crypto
 device		cryptodev
 
 #FDT
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions 	FDT_DTS_FILE=armada-388-gp.dts
Index: head/sys/arm/conf/ARMADAXP
===================================================================
--- head/sys/arm/conf/ARMADAXP	(revision 302505)
+++ head/sys/arm/conf/ARMADAXP	(revision 302506)
@@ -1,88 +1,87 @@
 #
 # Custom kernel for Marvell Armada XP
 #
 # 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		MV-88F78XX0
 
 include 	"std.armv6"
 include 	"../mv/armadaxp/std.mv78x60"
 
 options 	SOC_MV_ARMADAXP
 
 makeoptions	WERROR="-Werror"
 
-options 	HZ=1000
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 
 # NFS root from boopt/dhcp
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=mge0
 
 options 	ROOTDEVNAME=\"ufs:/dev/da0p1\"
 
 options 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 # Pseudo devices
 device		random
 device		pty
 device		loop
 device		md
 
 # USB
 device		usb
 device		ehci
 device		umass
 device		scbus
 device		pass
 device		da
 
 # SATA
 device		mvs
 
 # Serial ports
 device		uart
 
 # I2C (TWSI)
 device		iic
 device		iicbus
 device		twsi
 
 #Network
 device		ether
 device		mge			# Marvell Gigabit Ethernet controller
 device		mii
 device		mdio
 device		e1000phy
 device		bpf
 options 	DEVICE_POLLING
 device		vlan
 
 #PCI/PCIE
 device		pci
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=db78460.dts
Index: head/sys/arm/conf/BEAGLEBONE
===================================================================
--- head/sys/arm/conf/BEAGLEBONE	(revision 302505)
+++ head/sys/arm/conf/BEAGLEBONE	(revision 302506)
@@ -1,135 +1,134 @@
 #
 # BEAGLEBONE -- Custom configuration for the BeagleBone ARM development
 # platforms, check out http://www.beagleboard.org/bone and
 # http://www.beagleboard.org/black. This kernel config file is used for the
 # original BeagleBone and the BeagleBone Black.
 #
 # 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		BEAGLEBONE
 
 include 	"std.armv6"
 include 	"../ti/am335x/std.am335x"
 
 makeoptions	MODULES_EXTRA="dtb/am335x am335x_dmtpps"
 
 options 	INTRNG
 
-options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 
 # NFS server support
 #options 	NFSD
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=cpsw0
 
 # Boot device is 2nd slice on MMC/SD card
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 device		sdhci			# mmc/sd host controller
 
 # I2C support
 device		iicbus
 device		iic
 device		ti_i2c
 device		am335x_pmic		# AM335x Power Management IC (TPC65217)
 
 device		am335x_rtc		# RTC support (power management only)
 #define 	am335x_dmtpps		# Pulse Per Second capture driver
 
 # Console and misc
 device		uart
 device		uart_ns8250
 device		pty
 device		snp
 device		md
 device		random			# Entropy device
 
 # GPIO
 device		gpio
 device		gpioled
 device		gpiobacklight
 
 # SPI
 device		ti_spi
 device		spibus
 
 # ADC support
 device		ti_adc
 
 # Watchdog support
 # If we don't enable the watchdog driver, the system could potentially
 # reboot automatically because the boot loader might have enabled the
 # watchdog.
 device		ti_wdt
 
 # TI Programmable Realtime Unit support
 device		ti_pruss
 
 # Mailbox support
 device		ti_mbox
 
 # PMU support (for CCNT).
 device		pmu
 
 # USB support
 device		usb
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		musb
 device		umass
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 
 # Ethernet
 device		loop
 device		ether
 device		mii
 device		smscphy
 device		cpsw
 device		bpf
 
 # USB Ethernet support, requires miibus
 device		miibus
 device		axe			# ASIX Electronics USB Ethernet
 
 # Device mode support and USFS template
 device		usb_template    	# Control of the gadget
 device		usfs
 
 # Pinmux
 device		fdt_pinctrl
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 
 # Comment following lines for boot console on serial port
 device		vt
 device		videomode
 device		hdmi
 device		ums
 device		ukbd
 device		kbdmux
Index: head/sys/arm/conf/EXYNOS5.common
===================================================================
--- head/sys/arm/conf/EXYNOS5.common	(revision 302505)
+++ head/sys/arm/conf/EXYNOS5.common	(revision 302506)
@@ -1,126 +1,125 @@
 #
 # Kernel configuration for Samsung Exynos 5 SoC.
 #
 # 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$
 
 makeoptions	WERROR="-Werror"
 
 include 	"std.armv6"
-options 	HZ=100
 options 	SCHED_ULE		# ULE 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 	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 	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 	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 	SMP			# Enable multiple cores
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
 options 	ROOTDEVNAME=\"ufs:/dev/da0\"
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 device		dwmmc
 
 # Interrupt controller
 device		gic
 options 	INTRNG
 
 # ARM Generic Timer
 device		generic_timer
 
 # Pseudo devices
 
 device		loop
 device		random
 device		pty
 device		md
 device		gpio
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 #device		musb
 device		ehci
 #device		ohci
 device		xhci
 
 device		umass
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 
 # SATA
 #device		ata
 #device		atadisk
 #device		mvs
 
 # Serial ports
 device		uart
 
 # I2C (TWSI)
 device		iic
 device		iicbus
 
 # SPI
 device		spibus
 device		exynos_spi
 
 # Ethernet
 device		ether
 device		mii
 device		smsc
 device		smscphy
 
 # USB ethernet support, requires miibus
 device		miibus
 device		axe			# ASIX Electronics USB Ethernet
 device		bpf			# Berkeley packet filter
Index: head/sys/arm/conf/IMX53-QSB
===================================================================
--- head/sys/arm/conf/IMX53-QSB	(revision 302505)
+++ head/sys/arm/conf/IMX53-QSB	(revision 302506)
@@ -1,38 +1,36 @@
 # Kernel configuration for Freescale i.MX53 Quick Start 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
 
 include 	"IMX53"
 ident		IMX53-QSB
 
-options 	HZ=250			# 4ms scheduling quantum
-
 # required for netbooting
 #options 	BOOTP
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
 #options 	ROOTDEVNAME=\"ufs:ada0s2a\"
 
 # Flattened Device Tree
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=imx53-qsb.dts
Index: head/sys/arm/conf/IMX6
===================================================================
--- head/sys/arm/conf/IMX6	(revision 302505)
+++ head/sys/arm/conf/IMX6	(revision 302506)
@@ -1,126 +1,125 @@
 #
 # Kernel configuration for Freescale i.MX6 systems.
 #
 # 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		IMX6
 include 	"std.armv6"
 include 	"../freescale/imx/std.imx6"
 
 options 	INTRNG
 
 options 	SOC_IMX6
 
-options 	HZ=500			# Scheduling quantum is 2 milliseconds.
 options 	SCHED_ULE		# ULE scheduler
 #options 	NFSD			# Network Filesystem Server
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 options 	PLATFORM
 options 	SMP			# Enable multiple cores
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ffec0
 
 # U-Boot stuff lives on slice 1, FreeBSD on slice 2.
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
 
 # Interrupt controller
 device		gic
 # Cache controller
 device		pl310			# PL310 L2 cache controller
 # ARM MPCore timer
 device		mpcore_timer
 
 # Pseudo devices.
 device		loop			# Network loopback
 device		random			# Entropy device
 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
 device		ether			# Ethernet support
 device		miibus			# Required for ethernet
 device	 	bpf			# Berkeley packet filter (required for DHCP)
 
 # General-purpose input/output
 device		gpio
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
 
 # SDCard
 device		sdhci			# SD controller
 device		mmc			# SD/MMC protocol
 device		mmcsd			# SDCard disk device
 
 # 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
 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 modems
 #device		ukbd			# Allow keyboard like HIDs to control console
 #device		ums			# USB mouse
 
 # USB Ethernet, requires 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
 
 # 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
 
 device		vt
 device		kbdmux
 device		ukbd
 device		videomode
 device		hdmi
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 makeoptions	MODULES_EXTRA=dtb/imx6
 
 # SoC-specific devices
 device		ffec			# Freescale Fast Ethernet Controller
 device		fsliic			# Freescale i2c/iic
 device		iic			# iic protocol
 device		iicbus			# iic bus
 device		imxwdt			# Watchdog. WARNING: can't be disabled!!!
 
Index: head/sys/arm/conf/PANDABOARD
===================================================================
--- head/sys/arm/conf/PANDABOARD	(revision 302505)
+++ head/sys/arm/conf/PANDABOARD	(revision 302506)
@@ -1,115 +1,114 @@
 #
 # PANDABOARD -- Custom configuration for the PandaBoard ARM development
 # platform, check out www.pandaboard.org
 #
 # 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		PANDABOARD
 
 # This probably wants to move somewhere else.  Maybe we can create a basic
 # OMAP4340 config, then make a PANDABOARD config that includes the basic one,
 # adds the start addresses and custom devices plus pulls in this hints file.
 
 hints		"PANDABOARD.hints"
 
 include 	"std.armv6"
 include 	"../ti/omap4/pandaboard/std.pandaboard"
 
-options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM
 options 	SMP			# Enable multiple cores
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
 device		fdt_pinctrl
 # Interrupt controller
 device		gic
 options 	INTRNG
 
 # ARM MPCore timer
 device		mpcore_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 device		sdhci			# mmc/sd host controller
 
 # I2C support
 device		iicbus
 device		iic
 device		ti_i2c
 
 # Console and misc
 device		uart
 device		uart_ns8250
 device		pty
 device		snp
 device		md
 device		random			# Entropy device
 device		pl310			# PL310 L2 cache controller
 
 # GPIO
 device		gpio
 device		gpioled
 
 # The following enables MFS as root, this seems similar to an initramfs or initrd
 # as used in Linux.
 #options 	MD_ROOT
 #options 	MD_ROOT_SIZE=7560
 
 
 
 # USB support
 device		usb
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		ohci
 device		ehci
 device		umass
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 
 # Ethernet
 device		loop
 device		ether
 device		mii
 device		smc
 device		smcphy
 device		bpf
 
 # USB Ethernet support, requires miibus
 device		miibus
 #device		axe			# ASIX Electronics USB Ethernet
 device		smsc			# SMSC LAN95xx USB Ethernet
 
 
 # OMAP-specific devices
 device		ti_sdma
 device		twl
 device		twl_vreg
 device		twl_clks
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=pandaboard.dts
Index: head/sys/arm/conf/RK3188
===================================================================
--- head/sys/arm/conf/RK3188	(revision 302505)
+++ head/sys/arm/conf/RK3188	(revision 302506)
@@ -1,93 +1,92 @@
 #
 # Kernel configuration for Rockchip RK3188 systems.
 #
 # 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		RK3188
 
 include 	"std.armv6"
 include 	"../rockchip/std.rk30xx"
 
-options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 
 # Root mount from MMC/SD card
 options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0\"
 
 # Interrupt controller
 device		gic
 options 	INTRNG
 
 # ARM MPCore timer
 device		mpcore_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 device		dwmmc
 
 # Console and misc
 device		uart
 device		uart_snps
 device		pty
 device		snp
 device		md
 device		random			# Entropy device
 
 # I2C support
 #device		iicbus
 #device		iic
 
 # GPIO
 device		gpio
 
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 
 # USB support
 options 	USB_HOST_ALIGN=32	# Align usb buffers to cache line size.
 device		usb
 device		dwcotg			# DWC OTG controller
 
 device		umass
 
 # Ethernet
 device		loop
 device		ether
 device		mii
 device		bpf
 
 # Wireless NIC cards
 options 	IEEE80211_DEBUG
 options 	IEEE80211_AMPDU_AGE
 options 	IEEE80211_SUPPORT_MESH
 options 	IEEE80211_SUPPORT_TDMA
 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		firmware		# Used by the above
 
 # USB Ethernet support, requires miibus
 device		miibus
 device		udav
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
Index: head/sys/arm/conf/RPI-B
===================================================================
--- head/sys/arm/conf/RPI-B	(revision 302505)
+++ head/sys/arm/conf/RPI-B	(revision 302506)
@@ -1,97 +1,96 @@
 #
 # RPI-B -- Custom configuration for the Raspberry Pi
 #
 # 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		RPI-B
 
 include 	"std.armv6"
 include 	"../broadcom/bcm2835/std.rpi"
 include 	"../broadcom/bcm2835/std.bcm2835"
 
 options 	INTRNG
 
-options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PLATFORM
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
 #options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
 device		bpf
 device		loop
 device		ether
 device		uart
 device		pty
 device		snp
 device		pl011
 
 # Comment following lines for boot console on serial port
 device		vt
 device		kbdmux
 device		ukbd
 
 device		sdhci
 device		mmc
 device		mmcsd
 
 device		gpio
 device		gpioled
 
 # I2C
 device		iic
 device		iicbus
 device		bcm2835_bsc
 
 device		md
 device		random			# Entropy device
 
 # USB support
 device		usb
 device		dwcotg			# DWC OTG controller
 
 # USB storage support
 device		scbus
 device		da
 device		umass
 
 # USB ethernet support
 device		smcphy
 device		mii
 device		smsc
 
 # SPI
 device		spibus
 device		bcm2835_spi
 
 device		vchiq
 device		sound
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 # Note:  DTB is normally loaded and modified by RPi boot loader, then
 # handed to kernel via U-Boot and ubldr.
 #options 	FDT_DTB_STATIC
 #makeoptions	FDT_DTS_FILE=rpi.dts
 makeoptions	MODULES_EXTRA=dtb/rpi
Index: head/sys/arm/conf/RPI2
===================================================================
--- head/sys/arm/conf/RPI2	(revision 302505)
+++ head/sys/arm/conf/RPI2	(revision 302506)
@@ -1,101 +1,100 @@
 #
 # RPI2 -- Custom configuration for the Raspberry Pi 2
 #
 # 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		RPI2
 
 include 	"std.armv6"
 include 	"../broadcom/bcm2835/std.rpi"
 include 	"../broadcom/bcm2835/std.bcm2836"
 
 options 	INTRNG
 
-options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 options 	PLATFORM
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
 # ARM Generic Timer
 device		generic_timer
 
 device		bpf
 device		loop
 device		ether
 device		uart
 device		pty
 device		snp
 device		pl011
 
 # Comment following lines for boot console on serial port
 device		vt
 device		kbdmux
 device		ukbd
 
 device		sdhci
 device		mmc
 device		mmcsd
 
 device		gpio
 device		gpioled
 
 # I2C
 device		iic
 device		iicbus
 device		bcm2835_bsc
 
 device		md
 device		random			# Entropy device
 
 # USB support
 device		usb
 device		dwcotg			# DWC OTG controller
 
 # USB storage support
 device		scbus
 device		da
 device		umass
 
 # USB ethernet support
 device		smcphy
 device		mii
 device		smsc
 
 # SPI
 device		spibus
 device		bcm2835_spi
 
 device		vchiq
 device		sound
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 # Note:  DTB is normally loaded and modified by RPi boot loader, then
 # handed to kernel via U-Boot and ubldr.
 #options 	FDT_DTB_STATIC
 #makeoptions	FDT_DTS_FILE=rpi2.dts
 makeoptions	MODULES_EXTRA=dtb/rpi
Index: head/sys/arm/conf/SOCKIT.common
===================================================================
--- head/sys/arm/conf/SOCKIT.common	(revision 302505)
+++ head/sys/arm/conf/SOCKIT.common	(revision 302506)
@@ -1,95 +1,94 @@
 #
 # Kernel configuration for Terasic SoCKit (Altera Cyclone V SoC).
 #
 # 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$
 
 include 	"std.armv6"
 include 	"../altera/socfpga/std.socfpga"
 
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	WERROR="-Werror"
 
-options 	HZ=100
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP			# Enable multiple cores
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
 # Interrupt controller
 device		gic
 options 	INTRNG
 
 # ARM MPCore timer
 device		mpcore_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 device		dwmmc
 
 # Pseudo devices
 
 device		loop
 device		random
 device		pty
 device		md
 device		gpio
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
 #device		musb
 device		dwcotg
 
 device		umass
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 
 # Serial ports
 device		uart
 device		uart_ns8250
 
 # I2C (TWSI)
 device		iic
 device		iicbus
 
 # SPI
 device		spibus
 
 # Ethernet
 device		ether
 device		mii
 device		smsc
 device		smscphy
 device		dwc
 device		micphy
 
 # USB ethernet support, requires miibus
 device		miibus
 device		axe			# ASIX Electronics USB Ethernet
 device		bpf			# Berkeley packet filter
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
Index: head/sys/arm/conf/TEGRA124
===================================================================
--- head/sys/arm/conf/TEGRA124	(revision 302505)
+++ head/sys/arm/conf/TEGRA124	(revision 302506)
@@ -1,140 +1,139 @@
 #
 # Kernel configuration for NVIDIA Tegra124 based 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$
 
 include  	"std.armv6"
 include 	"../nvidia/tegra124/std.tegra124"
 
 ident		TEGRA124
 
-options 	HZ=100			# Scheduling quantum is 10 milliseconds.
 options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM		# Platform based SoC
 options 	PLATFORM_SMP
 options 	SMP			# Enable multiple cores
 options 	LINUX_BOOT_ABI
 
 # Interrupt controller
 device		gic
 
 # ARM Generic Timer
 device		generic_timer
 
 # EXT_RESOURCES pseudo devices
 options 	EXT_RESOURCES
 device		clk
 device		phy
 device		hwreset
 device		regulator
 
 # Pseudo devices.
 device		loop			# Network loopback
 device		random			# Entropy device
 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
 device		ether			# Ethernet support
 device		miibus			# Required for ethernet
 device		bpf			# Berkeley packet filter (required for DHCP)
 
 
 # General-purpose input/output
 device		gpio
 #device		gpioled
 
 # I2C support
 device		iic
 device		iicbus
 device		icee
 
 # Serial (COM) ports
 device		uart			# Multi-uart driver
 device		uart_ns8250
 
 # MMC/SD/SDIO Card slot support
 device		sdhci			# SD controller
 device		mmc			# SD/MMC protocol
 device		mmcsd			# SDCard disk device
 
 # ATA controllers
 device		ahci			# AHCI-compatible SATA controllers
 
 # 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.
 device		ehci			# EHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		uhid			# "Human Interface Devices"
 #device		u3g			# USB modems
 device		ukbd			# Allow keyboard like HIDs to control console
 device		ums			# USB mouse
 
 # USB Ethernet, requires 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
 
 # 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
 
 # PCI
 options 	NEW_PCIB
 device		pci
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		re			# RealTek 8139C+/8169/8169S/8110S
 
 # DRM2
 #device		fbd
 #device		vt
 #device		splash
 #device		kbdmux
 #device		drm2
 
 # Sound
 #device		sound
 #device		snd_hda
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 device  	fdt_pinctrl
 
 # SoC-specific devices
 
 #device  	hwpmc
Index: head/sys/arm/conf/VERSATILEPB
===================================================================
--- head/sys/arm/conf/VERSATILEPB	(revision 302505)
+++ head/sys/arm/conf/VERSATILEPB	(revision 302506)
@@ -1,75 +1,74 @@
 #
 # VERSATILEPB - Configuration for QEMU version of Versatile Platform 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$
 
 ident		VERSATILEPB
 machine		arm	armv6
 cpu 		CPU_ARM1176
 
 include 	"std.armv6"
 files		"../versatile/files.versatile"
 makeoptions	MODULES_OVERRIDE=""
 
 options 	KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
 
-options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	LINUX_BOOT_ABI		# Process metadata passed from Linux boot loaders
 
 options 	ROOTDEVNAME=\"ufs:da0s1a\"
 
 device		bpf
 device		loop
 device		mii
 device		mii_bitbang
 device		smc
 device		smcphy
 device		ether
 device		uart
 device		pl011
 device		pl190
 
 device		pty
 device		snp
 
 device		pci
 
 # SCSI Controllers
 device		sym			# NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D
 
 # ATA/SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # NOTE: serial console is disabled if syscons enabled
 # Comment following lines for headless setup
 device		sc
 device		kbdmux
 options 	SC_DFLT_FONT    	# compile font in
 makeoptions	SC_DFLT_FONT=cp437
 
 device		md
 device		random			# Entropy device
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=versatilepb.dts
Index: head/sys/arm/conf/VIRT
===================================================================
--- head/sys/arm/conf/VIRT	(revision 302505)
+++ head/sys/arm/conf/VIRT	(revision 302506)
@@ -1,62 +1,61 @@
 #
 # VIRT -- Custom configuration for the qemu virt platform
 #
 # 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		VIRT
 
 include 	"std.armv6"
 include 	"../qemu/std.virt"
 
-options 	HZ=100
-options 	SCHED_ULE		# 4BSD scheduler
+options 	SCHED_ULE		# ULE scheduler
 options 	PLATFORM
 options 	PLATFORM_SMP
 options 	SMP			# Enable multiple cores
 options 	MULTIDELAY
 
 # Interrupt controller
 device		gic
 options 	INTRNG
 
 # ARM Generic Timer
 device		generic_timer
 
 device		bpf
 device		loop
 device		ether
 device		uart
 device		pty
 device		snp
 device		pl011
 device		psci
 
 device		virtio
 device		virtio_mmio
 device		virtio_blk
 device		vtnet
 
 device		md
 device		random			# Entropy device
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
 
 # Extensible Firmware Interface
 options 	EFI
 
Index: head/sys/arm/conf/VYBRID
===================================================================
--- head/sys/arm/conf/VYBRID	(revision 302505)
+++ head/sys/arm/conf/VYBRID	(revision 302506)
@@ -1,115 +1,114 @@
 #
 # Kernel configuration for Vybrid Family 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		VYBRID
 include 	"std.armv6"
 include 	"../freescale/vybrid/std.vybrid"
 
 makeoptions	WERROR="-Werror"
 
-options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
 #options 	NANDFS			# NAND Filesystem
 #options 	SMP			# Enable multiple cores
 
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ffec0
 
 #options 	ROOTDEVNAME=\"nfs:10.5.0.1:/tftpboot/cosmic\"
 #options 	ROOTDEVNAME=\"nandfs:/dev/gnand0s.root\"
 options 	ROOTDEVNAME=\"ufs:/dev/da0\"
 
 options 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 # Interrupt controller
 device		gic
 options 	INTRNG
 
 # ARM MPCore timer
 device		mpcore_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 device		sdhci			# generic sdhci
 
 # Pseudo devices
 
 device		loop
 device		random
 device		pty
 device		md
 device		gpio
 
 # USB support
 options 	USB_HOST_ALIGN=32	# Align usb buffers to cache line size.
 device		usb
 #device		musb
 device		ehci
 #device		ohci
 
 device		umass
 device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 
 # SATA
 #device		ata
 #device		atadisk
 #device		mvs
 
 device		nand
 
 # Serial ports
 device		uart
 
 # I2C (TWSI)
 device		iic
 device		iicbus
 
 # Ethernet
 device		ether
 device		ffec
 
 # USB ethernet support, requires miibus
 device		miibus
 device		axe			# ASIX Electronics USB Ethernet
 device		bpf			# Berkeley packet filter
 
 device		sound
 
 # SPI
 device		spibus
 device		vf_spi
 
 # Framebuffer
 device		vt
 device		kbdmux
 device		ukbd
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
Index: head/sys/arm/conf/std.armv6
===================================================================
--- head/sys/arm/conf/std.armv6	(revision 302505)
+++ head/sys/arm/conf/std.armv6	(revision 302506)
@@ -1,77 +1,77 @@
 # Standard kernel config items for all ARMv6/v7 systems.
 #
 # $FreeBSD$
 
+options 	HZ=1000
 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 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 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
 
 # Debugging support.  Always need this:
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 
 # For full debugger support use (turn off in stable branch):
 options 	DDB			# Support DDB
 #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
 options 	ALT_BREAK_TO_DEBUGGER	# Enter debugger on keyboard escape sequence
 options 	USB_DEBUG		# Enable usb debug support code
 
 # Optional extras, never enabled by default:
 #options 	BOOTVERBOSE
 #options 	DEBUG			# May result in extreme spewage
 #options 	KTR
 #options 	KTR_COMPILE=KTR_ALL
 #options 	KTR_ENTRIES=16384
 #options 	KTR_MASK=(KTR_SPARE2)
 #options 	KTR_VERBOSE=0
 #options 	USB_REQ_DEBUG
 #options 	USB_VERBOSE
 #options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages