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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to