From owner-svn-src-all@FreeBSD.ORG  Sat Feb  7 00:41:10 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F129F553;
 Sat,  7 Feb 2015 00:41:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD1378B9;
 Sat,  7 Feb 2015 00:41:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t170f90W037527;
 Sat, 7 Feb 2015 00:41:09 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t170f9wA037524;
 Sat, 7 Feb 2015 00:41:09 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201502070041.t170f9wA037524@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 7 Feb 2015 00:41:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278340 - in head/sys: arm/conf modules
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Feb 2015 00:41:10 -0000

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