  2 files changed, 6 insertions(+), 7 deletions(-)
 
 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index 3cf768e..5d21335 100644
+index 6ebe0b3..12286dc 100644
 --- a/include/configs/am335x_evm.h
 +++ b/include/configs/am335x_evm.h
-@@ -104,8 +104,8 @@
+@@ -93,6 +93,7 @@
+ 	func(DHCP, dhcp, na)
+ 
+ #define CONFIG_BOOTCOMMAND \
++	"run mender_setup; " \
+ 	"run findfdt; " \
+ 	"run distro_bootcmd"
+ 
+@@ -135,8 +136,8 @@
  		"root=${ramroot} " \
  		"rootfstype=${ramrootfstype}\0" \
  	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \

From 35481b3b1547db1c6988205868958ff2bc11b612 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

 /* 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 199612b..42e817f 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -60,7 +60,7 @@
 #define DEFAULT_MMC_TI_ARGS \
 	"mmcdev=0\0" \
 	"mmcrootfstype=ext4 rootwait\0" \
