-From 35481b3b1547db1c6988205868958ff2bc11b612 Mon Sep 17 00:00:00 2001
+From 8ada882620ed3005dfc350678c41d47e70f631e2 Mon Sep 17 00:00:00 2001
 From: Kristian Amlie <kristian.amlie@mender.io>
 Date: Fri, 17 Jun 2016 14:54:04 +0200
 Subject: [PATCH] BBB: Use Mender boot code for selecting boot device and

 	"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 @@
 
 /* Bootcount using the RTC block */
 #define CONFIG_BOOTCOUNT_LIMIT

 #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
