uboot: assme we can use ${mmcdev}:${mmcpart}

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

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:

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:

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:

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

mk_mmc.sh

@@ -391,7 +391,6 @@ 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}
@@ -410,26 +409,6 @@ boot_uenv_txt_template () {
 		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}
-
-			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}
-
-			boot_classic=run loadkernel; run loadinitrd
-			boot_fdt=run loadkernel; run loadinitrd; run loadfdt
-
-		__EOF__
-	fi
 
 	if [ "${SERIAL_MODE}" ] ; then
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__