aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot/u-boot.inc
diff options
context:
space:
mode:
authorErkka Kääriä <erkka.kaaria@intel.com>2016-02-17 13:54:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 07:39:23 +0000
commit68d02c54342c8146ec89dfeadedd733cb59fc7d8 (patch)
treef69b385e680472fbedde6e382f3d3ef9454bf513 /meta/recipes-bsp/u-boot/u-boot.inc
parent48f5c2962a4121ba6172b535c90eaa16e8afa538 (diff)
downloadopenembedded-core-contrib-68d02c54342c8146ec89dfeadedd733cb59fc7d8.tar.gz
openembedded-core-contrib-68d02c54342c8146ec89dfeadedd733cb59fc7d8.tar.bz2
openembedded-core-contrib-68d02c54342c8146ec89dfeadedd733cb59fc7d8.zip
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. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot/u-boot.inc')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 41eb205ba2..ac8f338bd8 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/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"