diff --git a/mk_mmc.sh b/mk_mmc.sh
index 172fe35..c9c0208 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -434,209 +434,238 @@ function dl_netinstall_image {
 }
 
 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..
+	if [ "${USE_UIMAGE}" ] ; then
+		cat > ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			kernel_file=uImage
+			initrd_file=uInitrd
 
-	if [ ! "${USE_KMS}" ] ; then
-		cat > ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			#These video values are now set by default in the bootloader
-			#uncomment/change if you need something else
+		__EOF__
 
-			UENV_VRAM
-			UENV_FB
-			UENV_TIMING
+		cat > ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			kernel_file=uImage.net
+			initrd_file=uInitrd.net
 
 		__EOF__
+	else
+		cat > ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			kernel_file=zImage
+			initrd_file=initrd.img
 
-		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			#These video values are now set by default in the bootloader
-			#uncomment/change if you need something else
+		__EOF__
 
-			UENV_VRAM
-			UENV_FB
-			UENV_TIMING
+		cat > ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			kernel_file=zImage.net
+			initrd_file=initrd.net
 
 		__EOF__
 	fi
 
-	if [ "${USE_UIMAGE}" ] ; then
+	if [ "${need_dtbs}" ] ; then
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			initrd_high=0xffffffff
+			fdt_high=0xffffffff
+			dtb_file=${dtb_file}
+
+		__EOF__
+
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			kernel_file=uImage.net
-			initrd_file=uInitrd.net
+			initrd_high=0xffffffff
+			fdt_high=0xffffffff
+			dtb_file=${dtb_file}
+
 		__EOF__
+	fi
 
+	if [ ! "${USE_KMS}" ] ; then
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			kernel_file=uImage
-			initrd_file=uInitrd
+			#Video: Uncomment to override U-Boots value:
+			UENV_FB
+			UENV_TIMING
+			UENV_VRAM
+
 		__EOF__
-	else
+
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			kernel_file=zImage.net
-			initrd_file=initrd.net
-		__EOF__
+			#Video: Uncomment to override U-Boots value:
+			UENV_FB
+			UENV_TIMING
+			UENV_VRAM
 
-		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			kernel_file=zImage
-			initrd_file=initrd.img
 		__EOF__
 	fi
 
-	cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+	cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+		console=SERIAL_CONSOLE
+
+		mmcroot=FINAL_PART ro
+		mmcrootfstype=FINAL_FSTYPE rootwait fixrtc
+
 		boot_fstype=${boot_fstype}
+		xyz_load_image=\${boot_fstype}load mmc 0:1 ${kernel_addr} \${kernel_file}
+		xyz_load_initrd=\${boot_fstype}load mmc 0:1 ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize}
+		xyz_load_dtb=\${boot_fstype}load mmc 0:1 ${dtb_addr} /dtbs/\${dtb_file}
 
+	__EOF__
+
+	cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 		console=DICONSOLE
 
 		mmcroot=/dev/ram0 rw
 
+		boot_fstype=${boot_fstype}
 		xyz_load_image=\${boot_fstype}load mmc 0:1 ${kernel_addr} \${kernel_file}
 		xyz_load_initrd=\${boot_fstype}load mmc 0:1 ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize}
 		xyz_load_dtb=\${boot_fstype}load mmc 0:1 ${dtb_addr} /dtbs/\${dtb_file}
 
-		xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ...
+	__EOF__
 
-		mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} \${device_args}
+	if [ ! "${need_dtbs}" ] ; then
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ...
 
-	__EOF__
+		__EOF__
 
-	cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-		boot_fstype=${boot_fstype}
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ...
 
-		console=SERIAL_CONSOLE
+		__EOF__
+	else
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ...
 
-		mmcroot=FINAL_PART ro
-		mmcrootfstype=FINAL_FSTYPE rootwait fixrtc
+		__EOF__
 
-		xyz_load_image=\${boot_fstype}load mmc 0:1 ${kernel_addr} \${kernel_file}
-		xyz_load_initrd=\${boot_fstype}load mmc 0:1 ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize}
-		xyz_load_dtb=\${boot_fstype}load mmc 0:1 ${dtb_addr} /dtbs/\${dtb_file}
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ...
+
+		__EOF__
+	fi
+
+	cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+		video_args=setenv video VIDEO_DISPLAY
+		device_args=run video_args; run expansion_args; run mmcargs
+		mmcargs=setenv bootargs console=\${console} \${optargs} \${video} root=\${mmcroot} rootfstype=\${mmcrootfstype} \${device_args}
 
-		xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; echo Booting from mmc ...
+	__EOF__
 
-		mmcargs=setenv bootargs console=\${console} \${optargs} VIDEO_DISPLAY root=\${mmcroot} rootfstype=\${mmcrootfstype} \${device_args}
+	cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+		video_args=setenv video VIDEO_DISPLAY
+		device_args=run video_args; run expansion_args; run mmcargs
+		mmcargs=setenv bootargs console=\${console} \${optargs} \${video} root=\${mmcroot} \${device_args}
 
 	__EOF__
 
 	case "${SYSTEM}" in
 	beagle_bx|beagle_cx)
-		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			deviceargs=setenv device_args buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			optargs=VIDEO_CONSOLE
+			expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
 
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+		__EOF__
+		;;
+	beagle_xm)
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			optargs=VIDEO_CONSOLE
-			deviceargs=setenv device_args buddy=\${buddy} buddy2=\${buddy2} musb_hdrc.fifo_mode=5
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+			expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2}
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
-		;;
-	beagle_xm)
+
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			deviceargs=setenv device_args buddy=\${buddy} buddy2=\${buddy2}
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+			expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2}
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
-
+		;;
+	crane|igepv2|mx51evk|mx53loco)
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			optargs=VIDEO_CONSOLE
-			deviceargs=setenv device_args buddy=\${buddy} buddy2=\${buddy2}
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+			expansion_args=setenv expansion
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
-		;;
-	crane|igepv2|mx51evk|mx53loco|panda|panda_es)
+
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			deviceargs=setenv device_args
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+			expansion_args=setenv expansion
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
-
+		;;
+	panda|panda_es)
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			optargs=VIDEO_CONSOLE
-			deviceargs=setenv device_args
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+			expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2}
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
-		;;
-	mx51evk_dtb|mx53loco_dtb)
-		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			initrd_high=0xffffffff
-			fdt_high=0xffffffff
 
-			xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ...
-
-			deviceargs=setenv device_args
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2}
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
-
+		;;
+	mx51evk_dtb|mx53loco_dtb)
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			initrd_high=0xffffffff
-			fdt_high=0xffffffff
+			optargs=VIDEO_CONSOLE
+			expansion_args=setenv expansion
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
 
-			xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ...
+		__EOF__
 
-			optargs=VIDEO_CONSOLE
-			deviceargs=setenv device_args
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			expansion_args=setenv expansion
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
 
 		__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; ${boot} ${kernel_addr} ${initrd_addr}
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			expansion_args=setenv expansion ip=\${ip_method}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run device_args; ${boot} ${kernel_addr} ${initrd_addr}
 
 		__EOF__
 
-		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; ${boot} ${kernel_addr} ${initrd_addr}
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			expansion_args=setenv expansion ip=\${ip_method}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run device_args; ${boot} ${kernel_addr} ${initrd_addr}
 
 		__EOF__
 		;;
 	bone_zimage)
-		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; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			expansion_args=setenv expansion ip=\${ip_method}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run device_args; ${boot} ${kernel_addr} ${initrd_addr}
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
 
-		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; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			expansion_args=setenv expansion ip=\${ip_method}
+			mmc_load_uimage=run xyz_mmcboot; run bootargs_defaults; run device_args; ${boot} ${kernel_addr} ${initrd_addr}
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
 		;;
 	mx6q_sabrelite)
-		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			initrd_high=0xffffffff
-			fdt_high=0xffffffff
-			dtb_file=${dtb_file}
-
-			xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ...
-
-			deviceargs=setenv device_args
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
-
-		__EOF__
-
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			initrd_high=0xffffffff
-			fdt_high=0xffffffff
-			dtb_file=${dtb_file}
-
-			xyz_mmcboot=run xyz_load_image; run xyz_load_initrd; run xyz_load_dtb; echo Booting from mmc ...
-
 			optargs=VIDEO_CONSOLE
-			deviceargs=setenv device_args
-			loaduimage=run xyz_mmcboot; run deviceargs; run mmcargs; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
+			expansion_args=setenv expansion
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
 
 		__EOF__
 
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			expansion_args=setenv expansion
+			loaduimage=run xyz_mmcboot; run device_args; ${boot} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
+
+		__EOF__
 		;;
 	esac
 }