uboot-inc: Backport patch to fix Beaglebone Black bootloader

Beaglebone Black boot started failing after upstream patch 755324c432f, and was
fixed in 7205442e6. Unfortunately, the u-boot upgrade from 2015.10 to 2016.01
only includes the former patch. The latter patch is backported to fix this.

(From OE-Core rev: 68d02c54342c8146ec89dfeadedd733cb59fc7d8)

Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

meta/recipes-bsp/u-boot/u-boot.inc

@@ -6,7 +6,8 @@ PROVIDES = "virtual/bootloader"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
 
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
+           file://0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch"
 
 S = "${WORKDIR}/git"
 

meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch

@@ -0,0 +1,34 @@
+From 7205442e621db54ea06c3bca2d793e1ae2214f9c Mon Sep 17 00:00:00 2001
+From: Tom Rini <trini@konsulko.com>
+Date: Thu, 10 Dec 2015 16:46:01 -0500
+Subject: [PATCH] am335x_evm.h: unsed CONFIG_BOOTDELAY
+
+Now that ti_armv7_common.h uses config_distro_defaults.h we don't need
+to include it again and then undef CONFIG_BOOTDELAY
+
+Signed-off-by: Tom Rini <trini@konsulko.com>
+
+Upstream-Status: Backport
+
+---
+ include/configs/am335x_evm.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index c51db8c..cf6a606 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -18,10 +18,6 @@
+
+ #include <configs/ti_am335x_common.h>
+
+-/* Don't override the distro default bootdelay */
+-#undef CONFIG_BOOTDELAY
+-#include <config_distro_defaults.h>
+-
+ #ifndef CONFIG_SPL_BUILD
+ #ifndef CONFIG_FIT
+ # define CONFIG_FIT
+--
+2.7.0
+