diff --git a/mk_mmc.sh b/mk_mmc.sh
index b2ec2d6..a32bd6d 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -599,113 +599,63 @@ function boot_uenv_txt_template {
 		__EOF__
 	fi
 
-case "$SYSTEM" in
-    beagle_bx)
-
-cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
-deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
-
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_netinstall_cmd
-
-cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
-optargs=VIDEO_CONSOLE
-deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
-
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_normalboot_cmd
-        ;;
-    beagle_cx)
-
-cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
-deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
-
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_netinstall_cmd
-
-cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
-optargs=VIDEO_CONSOLE
-deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
-
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_normalboot_cmd
-        ;;
-    beagle_xm)
-
-cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
-deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
-
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_netinstall_cmd
-
-cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
-optargs=VIDEO_CONSOLE
-deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
-
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_normalboot_cmd
-        ;;
-    crane)
-
-cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
-deviceargs=setenv device_args
-
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_netinstall_cmd
-
-cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
-optargs=VIDEO_CONSOLE
-deviceargs=setenv device_args
-
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_normalboot_cmd
-        ;;
-    panda)
-
-cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
-deviceargs=setenv device_args
+	case "${SYSTEM}" in
+	beagle_bx|beagle_cx)
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
 
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_netinstall_cmd
+		__EOF__
 
-cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
-optargs=VIDEO_CONSOLE
-deviceargs=setenv device_args
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			optargs=VIDEO_CONSOLE
+			deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
 
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_normalboot_cmd
-        ;;
-    panda_es)
+		__EOF__
+		;;
+	beagle_xm)
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
 
-cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
-deviceargs=setenv device_args
+		__EOF__
 
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_netinstall_cmd
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			optargs=VIDEO_CONSOLE
+			deviceargs=setenv device_args mpurate=\${mpurate} buddy=\${buddy} buddy2=\${buddy2}
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
 
-cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
-optargs=VIDEO_CONSOLE
-deviceargs=setenv device_args
+		__EOF__
+		;;
+	crane|panda|panda_es)
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			deviceargs=setenv device_args
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
 
-loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_normalboot_cmd
-        ;;
-    bone)
+		__EOF__
 
-cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<uenv_netinstall_cmd
-deviceargs=setenv device_args ip=\${ip_method}
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			optargs=VIDEO_CONSOLE
+			deviceargs=setenv device_args
+			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
 
-mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_netinstall_cmd
+		__EOF__
+		;;
+	bone)
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			deviceargs=setenv device_args ip=\${ip_method}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
 
-cat >> ${TEMPDIR}/bootscripts/normal.cmd <<uenv_normalboot_cmd
-deviceargs=setenv device_args ip=\${ip_method}
+		__EOF__
 
-mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
-uenv_normalboot_cmd
-        ;;
-esac
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			deviceargs=setenv device_args ip=\${ip_method}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run deviceargs; run mmcargs; bootm \${address_uimage} \${address_uinitrd}
 
+		__EOF__
+		;;
+	esac
 }
 
 function tweak_boot_scripts {