Index: stable/10/sys/arm/conf/IMX6
===================================================================
--- stable/10/sys/arm/conf/IMX6	(revision 284093)
+++ stable/10/sys/arm/conf/IMX6	(revision 284094)
@@ -1,163 +1,164 @@
 #
 # 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 	"../freescale/imx/std.imx6"
 
 options 	HZ=500			# Scheduling quantum is 2 milliseconds.
 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			# New Network Filesystem Client
 #options 	NFSD			# New Network Filesystem Server
 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 	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 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
 options 	SMP			# Enable multiple cores
 
 # 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.
 # Other debugging options...
 options 	ALT_BREAK_TO_DEBUGGER	# Use <CR><tilde><ctrl-b> to enter 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
 
 # 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\"
 
 # 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  	faith			# IPv6-to-IPv4 relaying (translation)
 #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
 #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 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
 
 # NOTE: serial console will be disabled if syscons enabled
 # Uncomment following lines for framebuffer/syscons support
 # Wandboard has no video console support yet.
 #device		sc
 #device		kbdmux
 #options 	SC_DFLT_FONT		# compile font in
 #makeoptions	SC_DFLT_FONT=cp437
 
 # 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: stable/10/sys/arm/conf/RPI-B
===================================================================
--- stable/10/sys/arm/conf/RPI-B	(revision 284093)
+++ stable/10/sys/arm/conf/RPI-B	(revision 284094)
@@ -1,141 +1,142 @@
 #
 # 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		"../broadcom/bcm2835/std.rpi"
 
 options 	HZ=100
 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 	QUOTA			# Enable disk quotas for UFS
 options 	NFSCL			# New 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
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	BREAK_TO_DEBUGGER
 options 	ALT_BREAK_TO_DEBUGGER
 #options 	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 	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
 
 # 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
 
 options 	KDB
 options 	DDB			# Enable the kernel debugger
 #options 	INVARIANTS		# Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 
 device		md
 device		random			# Entropy device
 
 # USB support
 device		usb
 options 	USB_DEBUG
 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
 
 # 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	FDT_DTS_FILE=rpi.dts
+makeoptions	MODULES_EXTRA=dtb/rpi
Index: stable/10/sys/modules/Makefile
===================================================================
--- stable/10/sys/modules/Makefile	(revision 284093)
+++ stable/10/sys/modules/Makefile	(revision 284094)
@@ -1,911 +1,913 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 SUBDIR_PARALLEL=
 
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
 
 SUBDIR=	\
 	${_3dfx} \
 	${_3dfx_linux} \
 	${_aac} \
 	${_aacraid} \
 	accf_data \
 	accf_dns \
 	accf_http \
 	acl_nfs4 \
 	acl_posix1e \
 	${_acpi} \
 	ae \
 	${_aesni} \
 	age \
 	${_agp} \
 	aha \
 	${_ahb} \
 	ahci \
 	${_aic} \
 	aic7xxx \
 	aio \
 	alc \
 	ale \
 	alq \
 	${_amdsbwd} \
 	${_amdtemp} \
 	amr \
 	${_an} \
 	${_aout} \
 	${_apm} \
 	${_arcmsr} \
 	${_arcnet} \
 	${_asmc} \
 	${_asr} \
 	ata \
 	ath \
 	ath_pci \
 	${_autofs} \
 	${_auxio} \
 	${_bce} \
 	bfe \
 	bge \
 	${_bxe} \
 	${_bios} \
 	${_bktr} \
 	${_bm} \
 	bridgestp \
 	bwi \
 	bwn \
 	cam \
 	${_canbepm} \
 	${_canbus} \
 	${_cardbus} \
 	${_carp} \
 	cas \
 	${_cbb} \
 	cc \
 	cd9660 \
 	cd9660_iconv \
 	${_ce} \
 	${_cfi} \
 	${_ciss} \
 	${_cm} \
 	${_cmx} \
 	${_coff} \
 	${_coretemp} \
 	${_cp} \
 	${_cpsw} \
 	${_cpuctl} \
 	${_cpufreq} \
 	${_crypto} \
 	${_cryptodev} \
 	${_cs} \
 	${_ct} \
 	${_ctau} \
 	ctl \
 	${_cxgb} \
 	${_cxgbe} \
 	dc \
 	dcons \
 	dcons_crom \
 	de \
 	${_dpms} \
 	${_dpt} \
 	${_drm} \
 	${_drm2} \
 	${_dtrace} \
 	dummynet \
 	${_ed} \
 	${_elink} \
 	${_em} \
 	en \
 	${_ep} \
 	${_epic} \
 	esp \
 	${_et} \
 	${_ex} \
 	${_exca} \
 	${_ext2fs} \
 	${_fatm} \
 	fdc \
 	fdescfs \
 	${_fe} \
 	${_filemon} \
 	firewire \
 	firmware \
 	fuse \
 	${_fxp} \
 	gem \
 	geom \
 	${_glxiic} \
 	${_glxsb} \
 	hatm \
 	hifn \
 	hme \
 	${_hpt27xx} \
 	${_hptiop} \
 	${_hptmv} \
 	${_hptnr} \
 	${_hptrr} \
 	hwpmc \
 	${_hyperv} \
 	${_i2c} \
         ${_ibcore} \
 	${_ibcs2} \
 	${_ichwd} \
 	${_ida} \
 	${_ie} \
 	if_bridge \
 	if_disc \
 	if_edsc \
 	if_ef \
 	if_epair \
 	if_faith \
 	${_if_gif} \
 	${_if_gre} \
 	${_if_me} \
 	if_lagg \
 	${_if_ndis} \
 	if_stf \
 	if_tap \
 	if_tun \
 	if_vlan \
 	${_igb} \
 	${_iir} \
 	${_imgact_binmisc} \
 	${_io} \
         ${_ipoib} \
 	${_ipdivert} \
 	${_ipfilter} \
 	${_ipfw} \
 	ipfw_nat \
 	${_ipmi} \
 	ip6_mroute_mod \
 	ip_mroute_mod \
 	${_ips} \
 	${_ipw} \
 	${_ipwfw} \
 	${_isci} \
 	isp \
 	${_ispfw} \
 	${_iwi} \
 	${_iwifw} \
 	${_iwn} \
 	${_iwnfw} \
 	${_ix} \
 	${_ixv} \
 	${_ixgb} \
 	${_ixgbe} \
 	${_ixl} \
 	${_ixlv} \
 	jme \
 	joy \
 	kbdmux \
 	kgssapi \
 	kgssapi_krb5 \
 	khelp \
 	krpc \
 	ksyms \
 	le \
 	lge \
 	libalias \
 	libiconv \
 	libmbpool \
 	libmchain \
 	${_lindev} \
 	${_linprocfs} \
 	${_linsysfs} \
 	${_linux} \
 	lmc \
 	lpt \
 	mac_biba \
 	mac_bsdextended \
 	mac_ifoff \
 	mac_lomac \
 	mac_mls \
 	mac_none \
 	mac_partition \
 	mac_portacl \
 	mac_seeotheruids \
 	mac_stub \
 	mac_test \
 	malo \
 	mcd \
 	md \
 	mem \
 	mfi \
 	mii \
 	mlx \
 	${_mlx4} \
 	${_mlx4ib} \
 	${_mlxen} \
 	${_mly} \
 	mmc \
 	mmcsd \
 	mpr \
 	mps \
 	mpt \
 	mqueue \
 	mrsas \
 	msdosfs \
 	msdosfs_iconv \
 	${_mse} \
 	msk \
 	${_mthca} \
 	mvs \
 	mwl \
 	${_mwlfw} \
 	mxge \
 	my \
 	${_nandfs} \
 	${_nandsim} \
 	${_ncp} \
 	${_ncv} \
 	${_ndis} \
 	netfpga10g \
 	${_netgraph} \
 	${_nfe} \
 	nfs_common \
 	nfscl \
 	nfsclient \
 	nfscommon \
 	nfsd \
 	nfslock \
 	nfslockd \
 	nfsserver \
 	nfssvc \
 	nge \
 	nmdm \
 	${_nsp} \
 	nullfs \
 	${_ntb} \
 	${_nvd} \
 	${_nve} \
 	${_nvme} \
 	${_nvram} \
 	${_nxge} \
 	${_opensolaris} \
 	oce \
 	${_padlock} \
 	patm \
 	${_pccard} \
 	${_pcfclock} \
 	pcn \
 	${_pf} \
 	${_pflog} \
 	${_pfsync} \
 	plip \
 	${_pmc} \
 	ppbus \
 	ppc \
 	ppi \
 	pps \
 	procfs \
 	pseudofs \
 	${_pst} \
 	pty  \
 	puc \
 	${_qlxge} \
 	${_qlxgb} \
 	${_qlxgbe} \
 	ral \
 	${_ralfw} \
 	${_random} \
 	rc4 \
 	${_rdma} \
 	re \
 	reiserfs \
 	rl \
 	${_s3} \
 	${_safe} \
 	${_sbni} \
 	scc \
 	scd \
 	${_scsi_low} \
 	sdhci \
 	sdhci_pci \
 	sem \
 	send \
 	${_sf} \
 	${_sfxge} \
 	sge \
 	siba_bwn \
 	siftr \
 	siis \
 	sis \
 	sk \
 	${_smbfs} \
 	${_sn} \
 	${_snc} \
 	snp \
 	${_sound} \
 	${_speaker} \
 	${_splash} \
 	${_sppp} \
 	ste \
 	${_stg} \
 	stge \
 	${_streams} \
 	${_svr4} \
 	${_sym} \
 	${_syscons} \
 	sysvipc \
 	${_ti} \
 	tl \
 	tmpfs \
 	${_toecore} \
 	${_tpm} \
 	trm \
 	${_twa} \
 	twe \
 	tws \
 	tx \
 	${_txp} \
 	uart \
 	ubsec \
 	udf \
 	udf_iconv \
 	ufs \
 	unionfs \
 	usb \
 	utopia \
 	${_vesa} \
 	${_virtio} \
 	vge \
 	${_viawd} \
 	vkbd \
 	${_vmm} \
 	${_vmware} \
 	${_vpo} \
 	vr \
 	vte \
 	vx \
 	${_vxge} \
 	wb \
 	${_wbwd} \
 	${_wi} \
 	wlan \
 	wlan_acl \
 	wlan_amrr \
 	wlan_ccmp \
 	wlan_rssadapt \
 	wlan_tkip \
 	wlan_wep \
 	wlan_xauth \
 	${_wpi} \
 	${_wpifw} \
 	${_x86bios} \
 	${_xe} \
 	xl \
 	${_zfs} \
 	zlib \
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _filemon=	filemon
 _imgact_binmisc=	imgact_binmisc
 _vmware=	vmware
 .endif
 
 .if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "arm" && \
 	${MACHINE_CPUARCH} != "mips"
 _syscons=	syscons
 _vpo=		vpo
 .endif
 
 .if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 # no BUS_SPACE_UNSPECIFIED
 # No barrier instruction support (specific to this driver)
 _sym=		sym
 # intr_disable() is a macro, causes problems
 .if ${MK_SOURCELESS_UCODE} != "no"
 _cxgb=		cxgb
 .endif
 .endif
 
 .if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \
 	${MACHINE_ARCH:C/mips(el)?/mips/} != "mips" && \
 	${MACHINE_ARCH} != "powerpc"
 _cxgbe=		cxgbe
 .endif
 
 .if ${MK_AUTOFS} != "no" || defined(ALL_MODULES)
 _autofs=	autofs
 .endif
 
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 .if exists(${.CURDIR}/../opencrypto)
 _crypto=	crypto
 _cryptodev=	cryptodev
 .endif
 .if exists(${.CURDIR}/../crypto)
 _random=	random
 .endif
 .endif
 
 .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _carp=	carp
 _toecore=	toecore
 _if_gif=	if_gif
 _if_gre=	if_gre
 .endif
 
 .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
 _if_me=		if_me
 .endif
 
 .if ${MK_IPFILTER} != "no" || defined(ALL_MODULES)
 _ipfilter=	ipfilter
 .endif
 
 .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
 _ipdivert=	ipdivert
 _ipfw=		ipfw
 .endif
 
 .if ${MK_ISCSI} != "no" || defined(ALL_MODULES)
 SUBDIR+=	iscsi
 SUBDIR+=	iscsi_initiator
 .endif
 
 .if ${MK_NAND} != "no" || defined(ALL_MODULES)
 _nandfs=	nandfs
 _nandsim=	nandsim
 .endif
 
 .if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES)
 _netgraph=	netgraph
 .endif
 
 .if (${MK_PF} != "no" && (${MK_INET_SUPPORT} != "no" || \
 	${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES)
 _pf=		pf
 _pflog=		pflog
 .if ${MK_INET_SUPPORT} != "no"
 _pfsync=	pfsync
 .endif
 .endif
 
 .if ${MK_SOURCELESS_UCODE} != "no"
 _bce=		bce
 _fatm=		fatm
 _fxp=		fxp
 _ispfw=		ispfw
 _mwlfw=		mwlfw
 _ralfw=		ralfw
 _sf=		sf
 _sn=		sn
 _ti=		ti
 _txp=		txp
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"
 # XXX some of these can move to the general case when de-i386'ed
 # XXX some of these can move now, but are untested on other architectures.
 _3dfx=		3dfx
 _3dfx_linux=	3dfx_linux
 _agp=		agp
 _aic=		aic
 _an=		an
 _aout=		aout
 _apm=		apm
 _arcnet=	arcnet
 _bktr=		bktr
 _bxe=		bxe
 _cardbus=	cardbus
 _cbb=		cbb
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ce=		ce
 .endif
 _coff=		coff
 .if ${MK_SOURCELESS_UCODE} != "no"
 _cp=		cp
 .endif
 _cpuctl=	cpuctl
 _cpufreq=	cpufreq
 _cs=		cs
 _dpms=		dpms
 _drm=		drm
 _drm2=		drm2
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _dtrace=	dtrace
 .endif
 _ed=		ed
 _elink=		elink
 _em=		em
 _ep=		ep
 _et=		et
 _exca=		exca
 _ext2fs=	ext2fs
 _fe=		fe
 _glxiic=	glxiic
 _glxsb=		glxsb
 _i2c=		i2c
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _ibcore=        ibcore
 .endif
 _ibcs2=		ibcs2
 _ie=		ie
 _if_ndis=	if_ndis
 _igb=		igb
 _io=		io
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _ipoib=         ipoib
 .endif
 _lindev=	lindev
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
 _mse=		mse
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mlx4=		mlx4
 _mlx4ib=	mlx4ib
 _mlxen=		mlxen
 _mthca=		mthca
 .endif
 _ncv=		ncv
 _ndis=		ndis
 _nsp=		nsp
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _opensolaris=	opensolaris
 .endif
 _pccard=	pccard
 _pcfclock=	pcfclock
 _pst=		pst
 _rdma=		rdma
 _safe=		safe
 _sbni=		sbni
 _scsi_low=	scsi_low
 _smbfs=		smbfs
 _sound=		sound
 _speaker=	speaker
 _splash=	splash
 _sppp=		sppp
 _stg=		stg
 _streams=	streams
 _svr4=		svr4
 _vxge=  	vxge
 _wbwd=		wbwd
 _wi=		wi
 _xe=		xe
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
 _zfs=		zfs
 .endif
 .if ${MACHINE} == "i386"
 _aac=		aac
 _aacraid=	aacraid
 _acpi=		acpi
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _aesni=		aesni
 .endif
 _ahb=		ahb
 _amdsbwd=	amdsbwd
 _amdtemp=	amdtemp
 _arcmsr=	arcmsr
 _asmc=		asmc
 _asr=		asr
 _bios=		bios
 _ciss=		ciss
 _cm=		cm
 _cmx=		cmx
 _coretemp=	coretemp
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ctau=		ctau
 .endif
 _dpt=		dpt
 _ex=		ex
 .if ${MK_SOURCELESS_HOST} != "no"
 _hpt27xx=	hpt27xx
 .endif
 _hptiop=	hptiop
 .if ${MK_SOURCELESS_HOST} != "no"
 _hptmv=		hptmv
 _hptnr=		hptnr
 _hptrr=		hptrr
 .endif
 _hyperv=	hyperv
 _ichwd=		ichwd
 _ida=		ida
 _iir=		iir
 _ipmi=		ipmi
 _ips=		ips
 _ipw=		ipw
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ipwfw=		ipwfw
 .endif
 _isci=		isci
 _iwi=		iwi
 .if ${MK_SOURCELESS_UCODE} != "no"
 _iwifw=		iwifw
 .endif
 _iwn=		iwn
 .if ${MK_SOURCELESS_UCODE} != "no"
 _iwnfw=		iwnfw
 .endif
 _ix=		ix
 _ixv=		ixv
 _ixgb=		ixgb
 _ixgbe=		ixgbe
 _mly=		mly
 _nfe=		nfe
 _nvd=		nvd
 .if ${MK_SOURCELESS_HOST} != "no"
 _nve=		nve
 .endif
 _nvme=		nvme
 _nvram=		nvram
 _nxge=		nxge
 _tpm=		tpm
 _viawd=		viawd
 _wpi=		wpi
 .if ${MK_SOURCELESS_UCODE} != "no"
 _wpifw=		wpifw
 .endif
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _padlock=	padlock
 .endif
 _s3=		s3
 _twa=		twa
 _vesa=		vesa
 _virtio=	virtio
 _x86bios=	x86bios
 .elif ${MACHINE} == "pc98"
 _canbepm=	canbepm
 _canbus=	canbus
 _ct=		ct
 _pmc=		pmc
 _snc=		snc
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 _aac=		aac
 _aacraid=	aacraid
 _aout=		aout
 _acpi=		acpi
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _aesni=		aesni
 .endif
 _agp=		agp
 _an=		an
 _amdsbwd=	amdsbwd
 _amdtemp=	amdtemp
 _arcmsr=	arcmsr
 _asmc=		asmc
 _bktr=		bktr
 _bxe=		bxe
 _cardbus=	cardbus
 _cbb=		cbb
 _cmx=		cmx
 _ciss=		ciss
 _coretemp=	coretemp
 _cpuctl=	cpuctl
 _cpufreq=	cpufreq
 _dpms=		dpms
 _drm=		drm
 _drm2=		drm2
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _dtrace=	dtrace
 .endif
 _ed=		ed
 _et=		et
 _em=		em
 _exca=		exca
 _ext2fs=	ext2fs
 .if ${MK_SOURCELESS_HOST} != "no"
 _hpt27xx=	hpt27xx
 .endif
 _hptiop=	hptiop
 .if ${MK_SOURCELESS_HOST} != "no"
 _hptmv=		hptmv
 _hptnr=		hptnr
 _hptrr=		hptrr
 .endif
 _hyperv=	hyperv
 _i2c=		i2c
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _ibcore=        ibcore
 .endif
 _ichwd=		ichwd
 _ida=		ida
 _if_ndis=	if_ndis
 _igb=		igb
 _iir=		iir
 _io=		io
 _ipmi=		ipmi
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _ipoib=         ipoib
 .endif
 _ips=		ips
 _ipw=		ipw
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ipwfw=		ipwfw
 .endif
 _isci=		isci
 _iwi=		iwi
 .if ${MK_SOURCELESS_UCODE} != "no"
 _iwifw=		iwifw
 .endif
 _iwn=		iwn
 .if ${MK_SOURCELESS_UCODE} != "no"
 _iwnfw=		iwnfw
 .endif
 _ix=		ix
 _ixv=		ixv
 _ixgb=		ixgb
 _ixgbe=		ixgbe
 _ixl=		ixl
 _ixlv=		ixlv
 _lindev=	lindev
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
 _mly=		mly
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _mlx4=		mlx4
 _mlx4ib=	mlx4ib
 _mlxen=		mlxen
 _mthca=		mthca
 .endif
 _ndis=		ndis
 _nfe=		nfe
 _ntb=		ntb
 _nvd=		nvd
 .if ${MK_SOURCELESS_HOST} != "no"
 _nve=		nve
 .endif
 _nvme=		nvme
 _nvram=		nvram
 _nxge=		nxge
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _opensolaris=	opensolaris
 .endif
 .if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
 _padlock=	padlock
 .endif
 _pccard=	pccard
 _qlxge=		qlxge
 _qlxgb=		qlxgb
 _qlxgbe=	qlxgbe
 _rdma=		rdma
 _s3=		s3
 _safe=		safe
 _scsi_low=	scsi_low
 _sfxge=		sfxge
 _smbfs=		smbfs
 _sound=		sound
 _speaker=	speaker
 _splash=	splash
 _sppp=		sppp
 _tpm=		tpm
 _twa=		twa
 _vesa=		vesa
 _viawd=		viawd
 _virtio=	virtio
 .if ${MK_BHYVE} != "no" || defined(ALL_MODULES)
 _vmm=		vmm
 .endif
 _vxge=  	vxge
 _x86bios=	x86bios
 _wbwd=		wbwd
 _wi=		wi
 _wpi=		wpi
 .if ${MK_SOURCELESS_UCODE} != "no"
 _wpifw=		wpifw
 .endif
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
 _zfs=		zfs
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "arm"
 _cfi=		cfi
 _cpsw=		cpsw
 .endif
 
 .if ${MACHINE_CPUARCH} == "ia64"
 _aac=		aac
 _aacraid=	aacraid
 _aic=		aic
 _an=		an
 _arcnet=	arcnet
 _asr=		asr
 _bktr=		bktr
 _cardbus=	cardbus
 _cbb=		cbb
 _ciss=		ciss
 _cm=		cm
 _cmx=		cmx
 _coff=		coff
 _cpufreq=	cpufreq
 _dpt=		dpt
 _em=		em
 _ep=		ep
 _et=		et
 _exca=		exca
 _fe=		fe
 _hptiop=	hptiop
 _ida=		ida
 _igb=		igb
 _iir=		iir
 _ips=		ips
 _mly=		mly
 _pccard=	pccard
 _scsi_low=	scsi_low
 _smbfs=		smbfs
 _sound=		sound
 _splash=	splash
 _sppp=		sppp
 _streams=	streams
 _tpm=		tpm
 _twa=		twa
 _wi=		wi
 _xe=		xe
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc"
 _agp=		agp
 _an=		an
 _bm=		bm
 _cardbus=	cardbus
 _cbb=		cbb
 _cfi=		cfi
 _cpufreq=	cpufreq
 _drm=		drm
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _dtrace=	dtrace
 .endif
 _exca=		exca
 _nvram=		powermac_nvram
 _pccard=	pccard
 _smbfs=		smbfs
 _sound=		sound
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _opensolaris=	opensolaris
 .endif
 _wi=		wi
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64"
 _drm2=		drm2
 _i2c=		i2c
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
 _zfs=		zfs
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "sparc64"
 _auxio=		auxio
 _em=		em
 _epic=		epic
 _i2c=		i2c
 _igb=		igb
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _opensolaris=	opensolaris
 .endif
 _smbfs=		smbfs
 _sound=		sound
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
 _zfs=		zfs
 .endif
 .endif
 
 .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES)
 SUBDIR=${MODULES_OVERRIDE}
 .endif
 
+SUBDIR+=${MODULES_EXTRA}
+
 .for reject in ${WITHOUT_MODULES}
 SUBDIR:= ${SUBDIR:N${reject}}
 .endfor
 
 # Calling kldxref(8) for each module is expensive.
 .if !defined(NO_XREF)
 .MAKEFLAGS+=	-DNO_XREF
 afterinstall:
 	@if type kldxref >/dev/null 2>&1; then \
 		${ECHO} kldxref ${DESTDIR}${KMODDIR}; \
 		kldxref ${DESTDIR}${KMODDIR}; \
 	fi
 .endif
 
 .include <bsd.subdir.mk>
Index: stable/10/sys/modules/dtb/imx6/Makefile
===================================================================
--- stable/10/sys/modules/dtb/imx6/Makefile	(nonexistent)
+++ stable/10/sys/modules/dtb/imx6/Makefile	(revision 284094)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+# All the dts files for imx6 systems we support.
+DTS=	\
+	imx6dl-cubox-i.dts \
+	imx6q-cubox-i.dts \
+	imx6dl-hummingboard.dts \
+	imx6q-hummingboard.dts \
+	imx6dl-wandboard.dts \
+	imx6q-wandboard.dts
+
+.include <bsd.dtb.mk>

Property changes on: stable/10/sys/modules/dtb/imx6/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: stable/10/sys/modules/dtb/rpi/Makefile
===================================================================
--- stable/10/sys/modules/dtb/rpi/Makefile	(nonexistent)
+++ stable/10/sys/modules/dtb/rpi/Makefile	(revision 284094)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+# DTS files for the Raspberry Pi-B
+DTS=rpi.dts
+
+.include <bsd.dtb.mk>

Property changes on: stable/10/sys/modules/dtb/rpi/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: stable/10
===================================================================
--- stable/10	(revision 284093)
+++ stable/10	(revision 284094)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r278338,278340,279551,279593