From 56a6e25feffbd3a4bbc94741f9b8f21a731c236f Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 21 Nov 2011 10:08:58 -0600
Subject: [PATCH] move uEnv.cmd into script

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh                 | 17 +++++++++++++++--
 scripts/uEnv.txt/uEnv.cmd |  3 ---
 2 files changed, 15 insertions(+), 5 deletions(-)
 delete mode 100644 scripts/uEnv.txt/uEnv.cmd

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 74d0db3..05c78a8 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -162,8 +162,21 @@ boot_cmd
 
 }
 
+function boot_scr_to_uenv_txt {
+
+cat > ${TEMPDIR}/bootscripts/uEnv.cmd <<uenv_boot_cmd
+bootenv=boot.scr
+loaduimage=fatload mmc \${mmcdev} \${loadaddr} \${bootenv}
+mmcboot=echo Running boot.scr script from mmc ...; source \${loadaddr}
+uenv_boot_cmd
+
+}
+
 function set_defaults {
 
+ boot_files_template
+ boot_scr_to_uenv_txt
+
  wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ http://rcn-ee.net/deb/${DIST}/LATEST-${SUBARCH}
 
  if [ "$BETA_KERNEL" ];then
@@ -735,10 +748,10 @@ mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${T
 
 if [ "${USE_UENV}" ] ; then
  cp -v ${DIR}/scripts/uEnv.txt/beaglebone.cmd ${TEMPDIR}/disk/uEnv.txt
- cat ${TEMPDIR}/disk/uEnv.txt
 else
- cp -v ${DIR}/scripts/uEnv.txt/uEnv.cmd ${TEMPDIR}/disk/uEnv.txt
+ cp -v ${TEMPDIR}/bootscripts/uEnv.cmd ${TEMPDIR}/disk/uEnv.txt
 fi
+cat ${TEMPDIR}/disk/uEnv.txt
 
 echo "boot.cmd"
 cat ${TEMPDIR}/bootscripts/boot.cmd
diff --git a/scripts/uEnv.txt/uEnv.cmd b/scripts/uEnv.txt/uEnv.cmd
deleted file mode 100644
index ce65475..0000000
--- a/scripts/uEnv.txt/uEnv.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-bootenv=boot.scr
-loaduimage=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}
-mmcboot=echo Running boot.scr script from mmc ...; source ${loadaddr}