summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2015-02-07 00:41:08 +0000
committerimp <imp@FreeBSD.org>2015-02-07 00:41:08 +0000
commitcc5ead19f5dee833baffebfd2b0ec923c579d175 (patch)
tree491f1d9d6022c8e654f6a3811828e172e766e6ef /sys
parent549ab093019cacb0fc6b9e00f13bd32dac63a3ff (diff)
downloadFreeBSD-src-cc5ead19f5dee833baffebfd2b0ec923c579d175.zip
FreeBSD-src-cc5ead19f5dee833baffebfd2b0ec923c579d175.tar.gz
Pull in the rpi.dts -> rpi.dtb module (dtb/rpi) and have it install
rpi.dtb in /boot/dtb by default.
Diffstat (limited to 'sys')
-rw-r--r--sys/arm/conf/RPI-B3
-rw-r--r--sys/modules/Makefile2
2 files changed, 4 insertions, 1 deletions
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
OpenPOWER on IntegriCloud