From 14b4a9e0300bc766177f7318ff21154bcfbbb307 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 23 Dec 2015 06:49:18 +0000 Subject: [PATCH] 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 --- tools/tools/nanobsd/embedded/common | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 76edbab3d0c4..a9e853023c95 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -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