svn commit: r283930 - in stable/10: share/mk sys/arm/conf sys/conf sys/modules/dtb

[Warner Losh]

Author: imp
Date: Tue Jun  2 21:24:47 2015
New Revision: 283930
URL: https://svnweb.freebsd.org/changeset/base/283930

Log:
  MFC:
  
  Merge r276846: Add infrastructure to build dtb files from dts files.

Added:
  stable/10/share/mk/bsd.dtb.mk
     - copied unchanged from r276846, head/share/mk/bsd.dtb.mk
  stable/10/sys/conf/dtb.mk
     - copied, changed from r276846, head/sys/conf/dtb.mk
  stable/10/sys/modules/dtb/
     - copied from r276846, head/sys/modules/dtb/
Modified:
  stable/10/share/mk/Makefile
  stable/10/sys/arm/conf/ATMEL
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/Makefile
==============================================================================
--- stable/10/share/mk/Makefile	Tue Jun  2 20:53:17 2015	(r283929)
+++ stable/10/share/mk/Makefile	Tue Jun  2 21:24:47 2015	(r283930)
@@ -11,6 +11,7 @@ FILES=	\
 	bsd.crunchgen.mk \
 	bsd.dep.mk \
 	bsd.doc.mk \
+	bsd.dtb.mk \
 	bsd.endian.mk \
 	bsd.files.mk \
 	bsd.incs.mk \

Copied: stable/10/share/mk/bsd.dtb.mk (from r276846, head/share/mk/bsd.dtb.mk)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/share/mk/bsd.dtb.mk	Tue Jun  2 21:24:47 2015	(r283930, copy of r276846, head/share/mk/bsd.dtb.mk)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+# Search for kernel source tree in standard places.
+.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
+    ${.CURDIR}/../../../../.. /sys /usr/src/sys
+.if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
+SYSDIR=	${_dir}
+.endif
+.endfor
+.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \
+    !exists(${SYSDIR}/conf/kmod.mk)
+.error Unable to locate the kernel source tree. Set SYSDIR to override.
+.endif
+
+.include "${SYSDIR}/conf/dtb.mk"
+
+.include <bsd.sys.mk>

Modified: stable/10/sys/arm/conf/ATMEL
==============================================================================
--- stable/10/sys/arm/conf/ATMEL	Tue Jun  2 20:53:17 2015	(r283929)
+++ stable/10/sys/arm/conf/ATMEL	Tue Jun  2 21:24:47 2015	(r283930)
@@ -15,7 +15,7 @@ makeoptions	KERNVIRTADDR=0xc0000000
 options 	KERNPHYSADDR=0x20000000
 options 	KERNVIRTADDR=0xc0000000
 
-makeoptions	MODULES_OVERRIDE=""
+makeoptions	MODULES_OVERRIDE="dtb/atmel"
 
 # list all boards here, but not just yet (no multiboard in mainline).
 options 	ARM_MANY_BOARD

Copied and modified: stable/10/sys/conf/dtb.mk (from r276846, head/sys/conf/dtb.mk)
==============================================================================
--- head/sys/conf/dtb.mk	Thu Jan  8 18:28:06 2015	(r276846, copy source)
+++ stable/10/sys/conf/dtb.mk	Tue Jun  2 21:24:47 2015	(r283930)
@@ -29,7 +29,7 @@
 .include <bsd.init.mk>
 # Grab all the options for a kernel build. For backwards compat, we need to
 # do this after bsd.own.mk.
-.include "kern.opts.mk"
+#.include "kern.opts.mk" # commented out to minize difference with 11.x and newer
 
 # Search for kernel source tree in standard places.
 .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys