From e88381d032f713f3017fad8b6e8208a8b2a05192 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 29 Mar 2011 12:06:27 -0500
Subject: [PATCH] boot.scr to uEnv.txt compatibility

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

diff --git a/mk_mmc.sh b/mk_mmc.sh
index df4acbf..f0482bb 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -128,7 +128,6 @@ esac
 
  if [ "$USB_ROOTFS" ];then
   sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/boot.scr/dvi-normal-*.cmd
-
   sed -i 's/mmcblk0p5/sda1/g' ${DIR}/scripts/boot.scr/serial-normal-*.cmd
  fi
 
@@ -513,10 +512,12 @@ sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${
 
 if [ "${SERIAL_MODE}" ] ; then
  sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/boot.scr/serial.cmd ${TEMPDIR}/disk/boot.scr
+ sudo cp -v ${DIR}/scripts/uEnv.txt/uEnv.cmd ${TEMPDIR}/disk/uEnv.txt
  sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/boot.scr/serial-normal-${DIST}.cmd ${TEMPDIR}/disk/user.scr
  sudo cp -v ${DIR}/scripts/boot.scr/serial-normal-${DIST}.cmd ${TEMPDIR}/disk/boot.cmd
 else
  sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Debian Installer" -d ${DIR}/scripts/boot.scr/dvi.cmd ${TEMPDIR}/disk/boot.scr
+ sudo cp -v ${DIR}/scripts/uEnv.txt/uEnv.cmd ${TEMPDIR}/disk/uEnv.txt
  sudo mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Boot" -d ${DIR}/scripts/boot.scr/dvi-normal-${DIST}.cmd ${TEMPDIR}/disk/user.scr
  sudo cp -v ${DIR}/scripts/boot.scr/dvi-normal-${DIST}.cmd ${TEMPDIR}/disk/boot.cmd
 fi
@@ -741,7 +742,6 @@ function reset_scripts {
 
  if [ "$USB_ROOTFS" ];then
   sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/boot.scr/dvi-normal-*.cmd
-
   sed -i 's/sda1/mmcblk0p5/g' ${DIR}/scripts/boot.scr/serial-normal-*.cmd
  fi
 
diff --git a/scripts/uEnv.txt/uEnv.cmd b/scripts/uEnv.txt/uEnv.cmd
new file mode 100644
index 0000000..ce65475
--- /dev/null
+++ b/scripts/uEnv.txt/uEnv.cmd
@@ -0,0 +1,3 @@
+bootenv=boot.scr
+loaduimage=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}
+mmcboot=echo Running boot.scr script from mmc ...; source ${loadaddr}