diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index eda4017..bc4a4ca 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -17,6 +17,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+#conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -26,13 +29,6 @@ uboot_CMD_LOAD="load"
 uboot_USE_MMC_DEFINES=1
 uboot_fdt_auto_detection=1
 
-#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 a09bc55..6e75601 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -17,6 +17,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+#conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -26,13 +29,6 @@ uboot_CMD_LOAD="load"
 uboot_USE_MMC_DEFINES=1
 uboot_fdt_auto_detection=1
 
-#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 aa5ca05..c77c804 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -17,6 +17,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+#conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -26,13 +29,6 @@ uboot_CMD_LOAD="load"
 uboot_USE_MMC_DEFINES=1
 uboot_fdt_auto_detection=1
 
-#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 508c303..158e4bc 100644
--- a/hwpack/docs.txt
+++ b/hwpack/docs.txt
@@ -31,6 +31,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -58,13 +61,6 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="fatload"
 
-#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:]
 [ABI:1 STABLE http://rcn-ee.net/deb/wheezy-armhf/v3.7.4-x8/install-me.sh]
diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index c85da42..2c4ffdc 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -22,6 +22,9 @@ boot_name="u-boot.imx"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 9e0e13a..c10f921 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -22,6 +22,9 @@ boot_name="u-boot.imx"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 cd9b666..07f2a3b 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -22,6 +22,9 @@ boot_name="u-boot.imx"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 3c32f12..9cb1e34 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -20,6 +20,9 @@ boot_name="u-boot.imx"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -28,13 +31,6 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 59c3b08..431ab2f 100644
--- a/hwpack/omap3-beagle-xm-v3.9-dt.conf
+++ b/hwpack/omap3-beagle-xm-v3.9-dt.conf
@@ -17,6 +17,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -24,13 +27,6 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="fatload"
 
-#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 aa02fd3..2e1c3b7 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -17,6 +17,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -24,13 +27,6 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="fatload"
 
-#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 7aec191..382e5d3 100644
--- a/hwpack/omap4-panda-a4.conf
+++ b/hwpack/omap4-panda-a4.conf
@@ -17,6 +17,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -24,13 +27,6 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 0ab2be0..4d1bb13 100644
--- a/hwpack/omap4-panda-es.conf
+++ b/hwpack/omap4-panda-es.conf
@@ -17,6 +17,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -24,13 +27,6 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 892ca95..694304f 100644
--- a/hwpack/omap4-panda-v3.9-dt.conf
+++ b/hwpack/omap4-panda-v3.9-dt.conf
@@ -17,6 +17,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -24,13 +27,6 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 02bbfa1..086aa26 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -17,6 +17,9 @@ boot_name="u-boot.img"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -24,13 +27,6 @@ boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 b48cc17..cb5de54 100644
--- a/hwpack/wandboard-dl.conf
+++ b/hwpack/wandboard-dl.conf
@@ -22,6 +22,9 @@ boot_name="u-boot.imx"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 55a5dc7..a4d6d3c 100644
--- a/hwpack/wandboard-solo.conf
+++ b/hwpack/wandboard-solo.conf
@@ -22,6 +22,9 @@ boot_name="u-boot.imx"
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
 conf_uboot_CONFIG_CMD_BOOTZ=1
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
@@ -30,13 +33,6 @@ uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
-#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 c6b03c2..3afa3fe 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1467,6 +1467,14 @@ process_dtb_conf () {
 		conf_normal_kernel_file=uImage
 		conf_net_kernel_file=uImage.net
 	fi
+
+	if [ "${conf_uboot_CONFIG_SUPPORT_RAW_INITRD}" ] ; then
+		conf_normal_initrd_file=initrd.img
+		conf_net_initrd_file=initrd.net
+	else
+		conf_normal_initrd_file=uInitrd
+		conf_net_initrd_file=uInitrd.net
+	fi
 }
 
 check_dtb_board () {
@@ -1558,14 +1566,6 @@ 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
@@ -1604,8 +1604,6 @@ 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
 		conf_uboot_CONFIG_CMD_BOOTZ=1
 		convert_uboot_to_dtb_board
 		;;
@@ -1627,8 +1625,6 @@ 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
 		conf_uboot_CONFIG_CMD_BOOTZ=1
 		convert_uboot_to_dtb_board
 		;;