svn commit: r278340 - in head/sys: arm/conf modules

[Warner Losh]

Author: imp
Date: Sat Feb  7 00:41:08 2015
New Revision: 278340
URL: https://svnweb.freebsd.org/changeset/base/278340

Log:
  Pull in the rpi.dts -> rpi.dtb module (dtb/rpi) and have it install
  rpi.dtb in /boot/dtb by default.

Modified:
  head/sys/arm/conf/RPI-B
  head/sys/modules/Makefile

Modified: head/sys/arm/conf/RPI-B
==============================================================================
--- head/sys/arm/conf/RPI-B	Sat Feb  7 00:38:18 2015	(r278339)
+++ head/sys/arm/conf/RPI-B	Sat Feb  7 00:41:08 2015	(r278340)
@@ -134,4 +134,5 @@ options 	FDT			# Configure using FDT/DTB
 # 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

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Sat Feb  7 00:38:18 2015	(r278339)
+++ head/sys/modules/Makefile	Sat Feb  7 00:41:08 2015	(r278340)
@@ -735,6 +735,8 @@ _zfs=		zfs
 
 .endif
 
+SUBDIR+=${MODULES_EXTRA}
+
 .for reject in ${WITHOUT_MODULES}
 SUBDIR:= ${SUBDIR:N${reject}}
 .endfor