diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index bc4a4ca..207bf31 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -26,7 +26,6 @@ boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
-uboot_USE_MMC_DEFINES=1
 uboot_fdt_auto_detection=1
 
 #Kernel:
diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index 6e75601..a858dc5 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -26,7 +26,6 @@ boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
-uboot_USE_MMC_DEFINES=1
 uboot_fdt_auto_detection=1
 
 #Kernel:
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index c77c804..03c5f56 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -26,7 +26,6 @@ boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
-uboot_USE_MMC_DEFINES=1
 uboot_fdt_auto_detection=1
 
 #Kernel:
diff --git a/hwpack/docs.txt b/hwpack/docs.txt
index 158e4bc..eea47c9 100644
--- a/hwpack/docs.txt
+++ b/hwpack/docs.txt
@@ -57,7 +57,6 @@ boot_name="u-boot.imx"
 boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="ext2"
-uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="fatload"
 
diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index 2c4ffdc..18bb888 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -29,7 +29,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
 boot_fstype="ext2"
-uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf
index c10f921..494b88a 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -29,7 +29,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
 boot_fstype="ext2"
-uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 07f2a3b..5313bde 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -29,7 +29,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
 boot_fstype="ext2"
-uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf
index 9cb1e34..e95188e 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -27,7 +27,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
 boot_fstype="ext2"
-uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf
index cb5de54..516183c 100644
--- a/hwpack/wandboard-dl.conf
+++ b/hwpack/wandboard-dl.conf
@@ -29,7 +29,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
 boot_fstype="ext2"
-uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf
index a4d6d3c..2f8984c 100644
--- a/hwpack/wandboard-solo.conf
+++ b/hwpack/wandboard-solo.conf
@@ -29,7 +29,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 #Bootloader: u-boot settings
 boot_script="uEnv.txt"
 boot_fstype="ext2"
-uboot_USE_MMC_DEFINES=1
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
 
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 72a7376..33209e4 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -391,45 +391,24 @@ boot_uenv_txt_template () {
 
 	__EOF__
 
-	if [ "${uboot_USE_MMC_DEFINES}" ] ; then
-		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			loadkernel=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
-			loadinitrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-			loadfdt=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
-
-			boot_classic=run loadkernel; run loadinitrd
-			boot_fdt=run loadkernel; run loadinitrd; run loadfdt
-
-		__EOF__
-		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			loadkernel=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
-			loadinitrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-			loadfdt=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
-
-			boot_classic=run loadkernel; run loadinitrd
-			boot_fdt=run loadkernel; run loadinitrd; run loadfdt
-
-		__EOF__
-	else
-		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			loadkernel=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file}
-			loadinitrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-			loadfdt=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${fdtfile}
+	cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+		loadkernel=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
+		loadinitrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
+		loadfdt=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
 
-			boot_classic=run loadkernel; run loadinitrd
-			boot_fdt=run loadkernel; run loadinitrd; run loadfdt
+		boot_classic=run loadkernel; run loadinitrd
+		boot_fdt=run loadkernel; run loadinitrd; run loadfdt
 
-		__EOF__
-		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			loadkernel=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file}
-			loadinitrd=${uboot_CMD_LOAD} mmc 0:1 ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-			loadfdt=${uboot_CMD_LOAD} mmc 0:1 ${conf_fdtaddr} /dtbs/\${fdtfile}
+	__EOF__
+	cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+		loadkernel=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
+		loadinitrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
+		loadfdt=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
 
-			boot_classic=run loadkernel; run loadinitrd
-			boot_fdt=run loadkernel; run loadinitrd; run loadfdt
+		boot_classic=run loadkernel; run loadinitrd
+		boot_fdt=run loadkernel; run loadinitrd; run loadfdt
 
-		__EOF__
-	fi
+	__EOF__
 
 	if [ "${SERIAL_MODE}" ] ; then
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__