  	"mmcloados=run args_mmc; " \
  		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
  			"if run loadfdt; then " \
-@@ -164,6 +164,7 @@
- #endif
- 
- #define CONFIG_BOOTCOMMAND \
-+	"run mender_setup; " \
- 	"run findfdt; " \
- 	"run mmcboot;" \
- 	"setenv mmcdev 1; " \
-@@ -197,7 +198,7 @@
+@@ -226,7 +227,7 @@
  
  /* Bootcount using the RTC block */
  #define CONFIG_BOOTCOUNT_LIMIT

 /* NAND: SPL related configs */
 #ifdef CONFIG_SPL_NAND_SUPPORT
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 6dc6515..026aac7 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -61,7 +61,7 @@
 #define DEFAULT_MMC_TI_ARGS \
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4 rootwait\0" \

 #define CONFIG_SYS_BOOTCOUNT_BE
 
 /* USB gadget RNDIS */
@@ -274,9 +275,7 @@
 					"-(NAND.file-system)"
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x000c0000
 #undef CONFIG_ENV_IS_NOWHERE
