diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index 92e079a..eda4017 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -13,8 +13,12 @@ boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
@@ -22,13 +26,6 @@ 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
diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index a47d3f0..a09bc55 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -13,8 +13,12 @@ boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
@@ -22,13 +26,6 @@ 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
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index 478c7f0..aa5ca05 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -13,8 +13,12 @@ boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
@@ -22,13 +26,6 @@ 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
diff --git a/hwpack/docs.txt b/hwpack/docs.txt
index 3c22b1f..508c303 100644
--- a/hwpack/docs.txt
+++ b/hwpack/docs.txt
@@ -27,8 +27,12 @@ boot_partition_size="64"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="loaduimage"
@@ -54,13 +58,6 @@ 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
diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index d986669..c85da42 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -18,21 +18,18 @@ boot_startmb="2"
 unset spl_name
 boot_name="u-boot.imx"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="ext2"
 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
diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf
index 5845110..9e0e13a 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -18,21 +18,18 @@ boot_startmb="2"
 unset spl_name
 boot_name="u-boot.imx"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="ext2"
 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
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 94c46c9..cd9b666 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -18,21 +18,18 @@ boot_startmb="2"
 unset spl_name
 boot_name="u-boot.imx"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="ext2"
 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
diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf
index 446e89d..3c32f12 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -16,21 +16,18 @@ boot_startmb="2"
 unset spl_name
 boot_name="u-boot.imx"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="ext2"
 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
diff --git a/hwpack/omap3-beagle-xm-v3.9-dt.conf b/hwpack/omap3-beagle-xm-v3.9-dt.conf
index aed61fa..59c3b08 100644
--- a/hwpack/omap3-beagle-xm-v3.9-dt.conf
+++ b/hwpack/omap3-beagle-xm-v3.9-dt.conf
@@ -13,20 +13,17 @@ boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 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
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 9d29191..aa02fd3 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -13,20 +13,17 @@ boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 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
diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf
index 5219f66..7aec191 100644
--- a/hwpack/omap4-panda-a4.conf
+++ b/hwpack/omap4-panda-a4.conf
@@ -13,20 +13,17 @@ boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 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
diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf
index 0946d1d..0ab2be0 100644
--- a/hwpack/omap4-panda-es.conf
+++ b/hwpack/omap4-panda-es.conf
@@ -13,20 +13,17 @@ boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 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
diff --git a/hwpack/omap4-panda-v3.9-dt.conf b/hwpack/omap4-panda-v3.9-dt.conf
index 22da3a3..892ca95 100644
--- a/hwpack/omap4-panda-v3.9-dt.conf
+++ b/hwpack/omap4-panda-v3.9-dt.conf
@@ -13,20 +13,17 @@ boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 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
diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index dd43417..02bbfa1 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -13,20 +13,17 @@ boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 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
diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf
index ba20362..b48cc17 100644
--- a/hwpack/wandboard-dl.conf
+++ b/hwpack/wandboard-dl.conf
@@ -18,21 +18,18 @@ boot_startmb="2"
 unset spl_name
 boot_name="u-boot.imx"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="ext2"
 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
diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf
index ae9d69d..55a5dc7 100644
--- a/hwpack/wandboard-solo.conf
+++ b/hwpack/wandboard-solo.conf
@@ -18,21 +18,18 @@ boot_startmb="2"
 unset spl_name
 boot_name="u-boot.imx"
 
+#Bootloader: u-boot features:
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
 #Bootloader: u-boot settings
-boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="ext2"
 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
diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh
index 60e28f9..4ed5c5c 100644
--- a/lib/debian-finish.sh
+++ b/lib/debian-finish.sh
@@ -147,7 +147,7 @@ if [ -f /boot/uboot/linux-image-*_1.0*_arm*.deb ] ; then
 	rm -f /boot/uboot/*modules.tar.gz || true
 
 	mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd
-	if [ "x${boot_image}" = "xbootm" ] ; then
+	if [ "${zreladdr}" ] ; then
 		mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
 	fi
 else
diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh
index d1f3c5c..183f0d5 100644
--- a/lib/ubuntu-finish.sh
+++ b/lib/ubuntu-finish.sh
@@ -168,7 +168,7 @@ if [ -f /boot/uboot/linux-image-*_1.0*_arm*.deb ] ; then
 	rm -f /boot/uboot/*modules.tar.gz || true
 
 	mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd
-	if [ "x${boot_image}" = "xbootm" ] ; then
+	if [ "${zreladdr}" ] ; then
 		mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
 	fi
 else
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 99fc5ce..c6b03c2 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -529,27 +529,27 @@ boot_uenv_txt_template () {
 	if [ ! "${need_dtbs}" ] ; then
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			#Classic Board File Boot:
-			${uboot_SCRIPT_ENTRY}=run boot_classic; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size}
+			${uboot_SCRIPT_ENTRY}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size}
 			#New Device Tree Boot:
-			#${uboot_SCRIPT_ENTRY}=run boot_fdt; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
+			#${uboot_SCRIPT_ENTRY}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			${uboot_SCRIPT_ENTRY}=run xyz_message; run boot_classic; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size}
+			${uboot_SCRIPT_ENTRY}=run xyz_message; run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size}
 
 		__EOF__
 	else
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			#Classic Board File Boot:
-			#${uboot_SCRIPT_ENTRY}=run boot_classic; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size}
+			#${uboot_SCRIPT_ENTRY}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size}
 			#New Device Tree Boot:
-			${uboot_SCRIPT_ENTRY}=run boot_fdt; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
+			${uboot_SCRIPT_ENTRY}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			${uboot_SCRIPT_ENTRY}=run xyz_message; run boot_fdt; run device_args; ${boot_image} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
+			${uboot_SCRIPT_ENTRY}=run xyz_message; run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
 
 		__EOF__
 	fi
@@ -1034,7 +1034,7 @@ initrd_device_settings () {
 		dd_uboot_seek=${dd_uboot_seek}
 		dd_uboot_bs=${dd_uboot_bs}
 
-		boot_image=${boot_image}
+		conf_bootcmd=${conf_bootcmd}
 		boot_script=${boot_script}
 		boot_fstype=${boot_fstype}
 
@@ -1240,20 +1240,15 @@ populate_boot () {
 
 		if [ -f ${TEMPDIR}/kernel/boot/vmlinuz-* ] ; then
 			LINUX_VER=$(ls ${TEMPDIR}/kernel/boot/vmlinuz-* | awk -F'vmlinuz-' '{print $2}')
-			if [ "${USE_UIMAGE}" ] ; then
-				echo "Using mkimage to create uImage"
-				mkimage -A arm -O linux -T kernel -C none -a ${conf_zreladdr} -e ${conf_zreladdr} -n ${LINUX_VER} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net
-				echo "-----------------------------"
-			else
-				echo "Copying Kernel image:"
-				cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/zImage.net
-				cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/${fki_vmlinuz}
-				echo "-----------------------------"
-			fi
+			echo "Copying Kernel images:"
+			mkimage -A arm -O linux -T kernel -C none -a ${conf_zreladdr} -e ${conf_zreladdr} -n ${LINUX_VER} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net
+			cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/zImage.net
+			cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/${fki_vmlinuz}
+			echo "-----------------------------"
 		fi
 
 		if [ -f ${TEMPDIR}/initrd.mod.gz ] ; then
-			echo "Copying Kernel initrd:"
+			echo "Copying Kernel initrds:"
 			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 "-----------------------------"
@@ -1311,7 +1306,7 @@ populate_boot () {
 			dd_uboot_seek=${dd_uboot_seek}
 			dd_uboot_bs=${dd_uboot_bs}
 
-			boot_image=${boot_image}
+			conf_bootcmd=${conf_bootcmd}
 			boot_script=${boot_script}
 			boot_fstype=${boot_fstype}
 
@@ -1458,6 +1453,22 @@ show_board_warning () {
 	fi
 }
 
+process_dtb_conf () {
+	if [ "${conf_warning}" ] ; then
+		show_board_warning
+	fi
+
+	if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then
+		conf_bootcmd="bootz"
+		conf_normal_kernel_file=zImage
+		conf_net_kernel_file=zImage.net
+	else
+		conf_bootcmd="bootm"
+		conf_normal_kernel_file=uImage
+		conf_net_kernel_file=uImage.net
+	fi
+}
+
 check_dtb_board () {
 	error_invalid_uboot_dtb=1
 
@@ -1474,11 +1485,7 @@ check_dtb_board () {
 		. "${DIR}"/hwpack/${dtb_board}.conf
 		populate_dtbs=1
 		unset error_invalid_uboot_dtb
-
-		if [ "${conf_warning}" ] ; then
-			show_board_warning
-		fi
-
+		process_dtb_conf
 	else
 		uboot_dtb_error
 		exit
@@ -1524,9 +1531,7 @@ is_omap () {
 
 convert_uboot_to_dtb_board () {
 	populate_dtbs=1
-	if [ "${conf_warning}" ] ; then
-		show_board_warning
-	fi
+	process_dtb_conf
 }
 
 check_uboot_type () {
@@ -1541,7 +1546,6 @@ check_uboot_type () {
 	unset need_dtbs
 	kernel_repo="STABLE"
 
-	boot_image="bootz"
 	unset spl_name
 	unset boot_name
 	unset bootloader_location
@@ -1602,6 +1606,8 @@ check_uboot_type () {
 		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
+		conf_uboot_CONFIG_CMD_BOOTZ=1
+		convert_uboot_to_dtb_board
 		;;
 	bone-video)
 		need_am335x_firmware="1"
@@ -1623,6 +1629,8 @@ check_uboot_type () {
 		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
+		conf_uboot_CONFIG_CMD_BOOTZ=1
+		convert_uboot_to_dtb_board
 		;;
 	bone_dt|bone_dtb)
 		echo "Note: [--dtb am335x-bone-serial] now replaces [--uboot bone_dtb]"