From cc5ead19f5dee833baffebfd2b0ec923c579d175 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Sat, 7 Feb 2015 00:41:08 +0000
Subject: Pull in the rpi.dts -> rpi.dtb module (dtb/rpi) and have it install
 rpi.dtb in /boot/dtb by default.

---
 sys/arm/conf/RPI-B   | 3 ++-
 sys/modules/Makefile | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 0b886dd..1c28f10 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -134,4 +134,5 @@ 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
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 7498dab..7f917d6 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -735,6 +735,8 @@ _zfs=		zfs
 
 .endif
 
+SUBDIR+=${MODULES_EXTRA}
+
 .for reject in ${WITHOUT_MODULES}
 SUBDIR:= ${SUBDIR:N${reject}}
 .endfor
-- 
cgit v1.1