  #define CONFIG_SYS_BOOTCOUNT_BE
  
  /* USB gadget RNDIS */
-@@ -396,11 +395,6 @@
+@@ -345,11 +344,6 @@
  					"-(rootfs)"
  #elif defined(CONFIG_EMMC_BOOT)
  #define CONFIG_ENV_IS_IN_MMC

 			"if run loadbootscript; then " \
 				"run bootscript;" \
 			"else " \
-- 
2.7.4


+	"importbootenv=echo Importing environment from ${mender_uboot_boot} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
-	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \
-	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-	"envboot=mmc dev ${mmcdev}; " \
+	"loadbootenv=fatload ${mender_uboot_boot} ${loadaddr} ${bootenvfile}\0" \
+	"loadimage=load ${mender_uboot_root} ${loadaddr} ${bootdir}/${bootfile}\0" \
+	"loadfdt=load ${mender_uboot_root} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+	"envboot=mmc dev ${mender_uboot_dev}; " \
 		"if mmc rescan; then " \
-			"echo SD/MMC found on device ${mmcdev};" \
