From dec24611ef673cff72f711d29b61aff9fc38e331 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 13 Mar 2012 13:38:34 -0500
Subject: [PATCH] mk_mmc bootscript cleanup ulcd

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 55a89fb..71d29bf 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -573,23 +573,19 @@ function boot_uenv_txt_template {
 		mmc_load_uinitrd=fatload mmc 0:1 \${address_uinitrd} \${bootinitrd}
 	__EOF__
 
-if test "-$ADDON-" = "-ulcd-"
-then
+	if [ "x${ADDON}" == "xulcd" ] ; then
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			lcd1=i2c mw 40 00 00; i2c mw 40 04 80; i2c mw 40 0d 05
+			uenvcmd=i2c dev 1; run lcd1; i2c dev 0
 
-cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<ulcd_uenv_netinstall_cmd
-
-lcd1=i2c mw 40 00 00; i2c mw 40 04 80; i2c mw 40 0d 05
-uenvcmd=i2c dev 1; run lcd1; i2c dev 0
-
-ulcd_uenv_netinstall_cmd
-
-cat >> ${TEMPDIR}/bootscripts/normal.cmd <<ulcd_uenv_normalboot_cmd
+		__EOF__
 
-lcd1=i2c mw 40 00 00; i2c mw 40 04 80; i2c mw 40 0d 05
-uenvcmd=i2c dev 1; run lcd1; i2c dev 0
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			lcd1=i2c mw 40 00 00; i2c mw 40 04 80; i2c mw 40 0d 05
+			uenvcmd=i2c dev 1; run lcd1; i2c dev 0
 
-ulcd_uenv_normalboot_cmd
-fi
+		__EOF__
+	fi
 
 case "$SYSTEM" in
     beagle_bx)