diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index f4f5350..92e079a 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -22,6 +22,20 @@ uboot_CMD_LOAD="load"
 uboot_USE_MMC_DEFINES=1
 uboot_fdt_auto_detection=1
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+#conf_normal_initrd_file=initrd.img
+#conf_net_initrd_file=initrd.net
+##otherwise:
+conf_normal_initrd_file=uInitrd
+conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
 kernel_subarch="omap-psp"
diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index 8c23d51..a47d3f0 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -22,6 +22,20 @@ uboot_CMD_LOAD="load"
 uboot_USE_MMC_DEFINES=1
 uboot_fdt_auto_detection=1
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+#conf_normal_initrd_file=initrd.img
+#conf_net_initrd_file=initrd.net
+##otherwise:
+conf_normal_initrd_file=uInitrd
+conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
 kernel_subarch="omap-psp"
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index 0adca25..478c7f0 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -22,6 +22,20 @@ uboot_CMD_LOAD="load"
 uboot_USE_MMC_DEFINES=1
 uboot_fdt_auto_detection=1
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+#conf_normal_initrd_file=initrd.img
+#conf_net_initrd_file=initrd.net
+##otherwise:
+conf_normal_initrd_file=uInitrd
+conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
 kernel_subarch="omap-psp"
diff --git a/hwpack/docs.txt b/hwpack/docs.txt
index db6dd1f..3c22b1f 100644
--- a/hwpack/docs.txt
+++ b/hwpack/docs.txt
@@ -50,8 +50,23 @@ boot_name="u-boot.imx"
 boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="ext2"
-uboot_SCRIPT_ENTRY="loaduimage"
-uboot_CMD_LOAD="ext2load"
+uboot_USE_MMC_DEFINES=1
+uboot_SCRIPT_ENTRY="uenvcmd"
+uboot_CMD_LOAD="fatload"
+
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
 
 [(4) Kernel Setup]
 [Raw Deb file or:]
diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index 5981384..d986669 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -26,6 +26,20 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
 kernel_subarch="imx"
diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf
index c3e17b3..5845110 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -26,6 +26,20 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
 kernel_subarch="imx"
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 8852b79..94c46c9 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -26,6 +26,20 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
 kernel_subarch="imx"
diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf
index 79b3dc7..446e89d 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -24,6 +24,20 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
 kernel_subarch="imx"
diff --git a/hwpack/omap3-beagle-xm-v3.9-dt.conf b/hwpack/omap3-beagle-xm-v3.9-dt.conf
index a30f271..aed61fa 100644
--- a/hwpack/omap3-beagle-xm-v3.9-dt.conf
+++ b/hwpack/omap3-beagle-xm-v3.9-dt.conf
@@ -20,6 +20,20 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="fatload"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
 kernel_subarch="omap"
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 9023432..9d29191 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -20,6 +20,20 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="fatload"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
 kernel_subarch="omap"
diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf
index de0404a..5219f66 100644
--- a/hwpack/omap4-panda-a4.conf
+++ b/hwpack/omap4-panda-a4.conf
@@ -20,6 +20,20 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
 kernel_subarch="omap"
diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf
index 1e6a242..0946d1d 100644
--- a/hwpack/omap4-panda-es.conf
+++ b/hwpack/omap4-panda-es.conf
@@ -20,6 +20,20 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
 kernel_subarch="omap"
diff --git a/hwpack/omap4-panda-v3.9-dt.conf b/hwpack/omap4-panda-v3.9-dt.conf
index fba28e1..22da3a3 100644
--- a/hwpack/omap4-panda-v3.9-dt.conf
+++ b/hwpack/omap4-panda-v3.9-dt.conf
@@ -20,6 +20,20 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
 kernel_subarch="omap"
diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index 48e821e..dd43417 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -20,6 +20,20 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
 kernel_subarch="omap"
diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf
index e295f4e..ba20362 100644
--- a/hwpack/wandboard-dl.conf
+++ b/hwpack/wandboard-dl.conf
@@ -26,6 +26,20 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
 kernel_subarch="wand"
diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf
index 58340ec..ae9d69d 100644
--- a/hwpack/wandboard-solo.conf
+++ b/hwpack/wandboard-solo.conf
@@ -26,6 +26,20 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
+#if: define CONFIG_CMD_BOOTZ
+conf_normal_kernel_file=zImage
+conf_net_kernel_file=zImage.net
+##otherwise
+#conf_normal_kernel_file=uImage
+#conf_net_kernel_file=uImage.net
+
+#if: define CONFIG_SUPPORT_RAW_INITRD
+conf_normal_initrd_file=initrd.img
+conf_net_initrd_file=initrd.net
+##otherwise:
+#conf_normal_initrd_file=uInitrd
+#conf_net_initrd_file=uInitrd.net
+
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx
 kernel_subarch="wand"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 552fdc5..99fc5ce 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -345,18 +345,6 @@ boot_uenv_txt_template () {
 		__EOF__
 	fi
 
-	if [ "${USE_UIMAGE}" ] ; then
-		conf_normal_kernel_file=uImage
-		conf_normal_initrd_file=uInitrd
-		conf_net_kernel_file=uImage.net
-		conf_net_initrd_file=uInitrd.net
-	else
-		conf_normal_kernel_file=zImage
-		conf_normal_initrd_file=initrd.img
-		conf_net_kernel_file=zImage.net
-		conf_net_initrd_file=initrd.net
-	fi
-
 	cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 		kernel_file=${conf_normal_kernel_file}
 		initrd_file=${conf_normal_initrd_file}
@@ -1265,15 +1253,10 @@ populate_boot () {
 		fi
 
 		if [ -f ${TEMPDIR}/initrd.mod.gz ] ; then
-			if [ "${USE_UIMAGE}" ] ; then
-				echo "Using mkimage to create uInitrd"
-				mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/uInitrd.net
-				echo "-----------------------------"
-			else
-				echo "Copying Kernel initrd:"
-				cp -v ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/initrd.net
-				echo "-----------------------------"
-			fi
+			echo "Copying Kernel initrd:"
+			mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/uInitrd.net
+			cp -v ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/initrd.net
+			echo "-----------------------------"
 		fi
 
 		if [ "${ACTUAL_DTB_FILE}" ] ; then
@@ -1571,6 +1554,14 @@ check_uboot_type () {
 	unset usbnet_mem
 	boot_partition_size="100"
 
+	#if: define CONFIG_CMD_BOOTZ
+	conf_normal_kernel_file=zImage
+	conf_net_kernel_file=zImage.net
+
+	#if: define CONFIG_SUPPORT_RAW_INITRD
+	conf_normal_initrd_file=initrd.img
+	conf_net_initrd_file=initrd.net
+
 	case "${UBOOT_TYPE}" in
 	beagle_bx)
 		. "${DIR}"/hwpack/omap3-beagle-xm.conf
@@ -1609,6 +1600,8 @@ check_uboot_type () {
 		#just to disable the omapfb stuff..
 		USE_KMS=1
 		conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
+		conf_normal_initrd_file=uInitrd
+		conf_net_initrd_file=uInitrd.net
 		;;
 	bone-video)
 		need_am335x_firmware="1"
@@ -1628,6 +1621,8 @@ check_uboot_type () {
 		#just to disable the omapfb stuff..
 		USE_KMS=1
 		conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
+		conf_normal_initrd_file=uInitrd
+		conf_net_initrd_file=uInitrd.net
 		;;
 	bone_dt|bone_dtb)
 		echo "Note: [--dtb am335x-bone-serial] now replaces [--uboot bone_dtb]"