From owner-svn-src-head@freebsd.org  Wed Dec 23 06:49:20 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 182A5A4FCDB;
 Wed, 23 Dec 2015 06:49:20 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 DD0A61D35;
 Wed, 23 Dec 2015 06:49:19 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBN6nJSS023271;
 Wed, 23 Dec 2015 06:49:19 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBN6nJsJ023270;
 Wed, 23 Dec 2015 06:49:19 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201512230649.tBN6nJsJ023270@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 23 Dec 2015 06:49:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292644 - head/tools/tools/nanobsd/embedded
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 06:49:20 -0000

Author: imp
Date: Wed Dec 23 06:49:18 2015
New Revision: 292644
URL: https://svnweb.freebsd.org/changeset/base/292644

Log:
  Copy all the dtb files that we build as part of the kernel build from
  boot/dtb to the fat partition. They seem to be needed.
  Create an empty uEnv.txt file

Modified:
  head/tools/tools/nanobsd/embedded/common

Modified: head/tools/tools/nanobsd/embedded/common
==============================================================================
--- head/tools/tools/nanobsd/embedded/common	Wed Dec 23 04:36:15 2015	(r292643)
+++ head/tools/tools/nanobsd/embedded/common	Wed Dec 23 06:49:18 2015	(r292644)
@@ -456,18 +456,26 @@ customize_cmd cust_comconsole
 
 dos_boot_part ( ) (
 	local d=/usr/local/share/u-boot/${NANO_BOOT_PKG}
+	local f=${NANO_FAT_DIR}
 
 	# For now, just copy all the files. However, for iMX6 and Allwinner,
 	# we'll need to put a special boot block at a fixed location
 	# on the disk as well.
-	rm -rf ${NANO_FAT_DIR}
-	mkdir ${NANO_FAT_DIR}
-	cp ${d}/* ${NANO_FAT_DIR}
+	rm -rf $f
+	mkdir $f
+	chdir $f
+	cp ${d}/* .
 
 	# Also copy ubldr. u-boot will load it and it will load the kernel
 	# from the ufs partition
-	cp ${NANO_WORLDDIR}/boot/ubldr ${NANO_FAT_DIR}
-	cp ${NANO_WORLDDIR}/boot/ubldr.bin ${NANO_FAT_DIR}
+	cp ${NANO_WORLDDIR}/boot/ubldr .
+	cp ${NANO_WORLDDIR}/boot/ubldr.bin .
+
+	# We have to touch the saveenv file
+	touch uEnv.txt
+
+	# Now we need to copy over dtb files from the build.
+	cp ${NANO_WORLDDIR}/boot/dtb/*.dtb .
 )
 
 if [ -n "$NANO_BOOT_PKG" ]; then