From c0d55ec6deef740609b3f10bb53dd9dcaebb55dc Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 13 Mar 2012 13:33:46 -0500
Subject: [PATCH] mk_mmc: bootscript refactor initial normal.cmd

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

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 4a8c63d..55a89fb 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -535,45 +535,43 @@ uenv_boot_cmd
 }
 
 function boot_uenv_txt_template {
-#(rcn-ee)in a way these are better then boot.scr, but each target is going to have a slightly different entry point..
+	#(rcn-ee)in a way these are better then boot.scr
+	#but each target is going to have a slightly different entry point..
 
-cat > ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_generic_netinstall_cmd
-bootfile=uImage.net
-bootinitrd=uInitrd.net
-address_uimage=UIMAGE_ADDR
-address_uinitrd=UINITRD_ADDR
+	cat > ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+		bootfile=uImage.net
+		bootinitrd=uInitrd.net
+		address_uimage=UIMAGE_ADDR
+		address_uinitrd=UINITRD_ADDR
 
-UENV_VRAM
+		UENV_VRAM
+		UENV_FB
+		UENV_TIMING
 
-console=DICONSOLE
+		console=DICONSOLE
 
-UENV_FB
-UENV_TIMING
+		mmcroot=/dev/ram0 rw
 
-mmcroot=/dev/ram0 rw
-
-mmc_load_uinitrd=fatload mmc 0:1 \${address_uinitrd} \${bootinitrd}
-uenv_generic_netinstall_cmd
-
-
-cat > ${TEMPDIR}/bootscripts/normal.cmd <<uenv_generic_normalboot_cmd
-bootfile=uImage
-bootinitrd=uInitrd
-address_uimage=UIMAGE_ADDR
-address_uinitrd=UINITRD_ADDR
+		mmc_load_uinitrd=fatload mmc 0:1 \${address_uinitrd} \${bootinitrd}
+	__EOF__
 
-UENV_VRAM
+	cat > ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+		bootfile=uImage
+		bootinitrd=uInitrd
+		address_uimage=UIMAGE_ADDR
+		address_uinitrd=UINITRD_ADDR
 
-console=SERIAL_CONSOLE
+		UENV_VRAM
+		UENV_FB
+		UENV_TIMING
 
-UENV_FB
-UENV_TIMING
+		console=SERIAL_CONSOLE
 
-mmcroot=FINAL_PART ro
-mmcrootfstype=FINAL_FSTYPE rootwait fixrtc
+		mmcroot=FINAL_PART ro
+		mmcrootfstype=FINAL_FSTYPE rootwait fixrtc
 
-mmc_load_uinitrd=fatload mmc 0:1 \${address_uinitrd} \${bootinitrd}
-uenv_generic_normalboot_cmd
+		mmc_load_uinitrd=fatload mmc 0:1 \${address_uinitrd} \${bootinitrd}
+	__EOF__
 
 if test "-$ADDON-" = "-ulcd-"
 then