From owner-svn-src-all@FreeBSD.ORG Tue Jun 2 21:24:49 2015 Return-Path: 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 5B1A8656; Tue, 2 Jun 2015 21:24:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) 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 3CC241356; Tue, 2 Jun 2015 21:24:49 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t52LOnjO062200; Tue, 2 Jun 2015 21:24:49 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t52LOm74062196; Tue, 2 Jun 2015 21:24:48 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201506022124.t52LOm74062196@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 2 Jun 2015 21:24:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r283930 - in stable/10: share/mk sys/arm/conf sys/conf sys/modules/dtb X-SVN-Group: stable-10 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.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2015 21:24:49 -0000 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 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 # 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