summaryrefslogtreecommitdiffstats
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:31 +0000
commita46dc87c92b4cf3f56c17b6f1d6e53ed0583bc09 (patch)
tree42ea945b227e844528e9666c45cf7b5f51c736c1
parentc7355b90d0abc401497e35f7c017d7db1a22d427 (diff)
downloadpoky-a46dc87c92b4cf3f56c17b6f1d6e53ed0583bc09.tar.gz
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>
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc3
-rw-r--r--meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch34
2 files changed, 36 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"
6LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95" 7LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
8 8
9SRC_URI = "git://git.denx.de/u-boot.git;branch=master" 9SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
10 file://0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch"
10 11
11S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
12 13
diff --git a/meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch b/meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch
new file mode 100644
index 0000000000..70c87c4cfd
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch
@@ -0,0 +1,34 @@
1From 7205442e621db54ea06c3bca2d793e1ae2214f9c Mon Sep 17 00:00:00 2001
2From: Tom Rini <trini@konsulko.com>
3Date: Thu, 10 Dec 2015 16:46:01 -0500
4Subject: [PATCH] am335x_evm.h: unsed CONFIG_BOOTDELAY
5
6Now that ti_armv7_common.h uses config_distro_defaults.h we don't need
7to include it again and then undef CONFIG_BOOTDELAY
8
9Signed-off-by: Tom Rini <trini@konsulko.com>
10
11Upstream-Status: Backport
12
13---
14 include/configs/am335x_evm.h | 4 ----
15 1 file changed, 4 deletions(-)
16
17diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
18index c51db8c..cf6a606 100644
19--- a/include/configs/am335x_evm.h
20+++ b/include/configs/am335x_evm.h
21@@ -18,10 +18,6 @@
22
23 #include <configs/ti_am335x_common.h>
24
25-/* Don't override the distro default bootdelay */
26-#undef CONFIG_BOOTDELAY
27-#include <config_distro_defaults.h>
28-
29 #ifndef CONFIG_SPL_BUILD
30 #ifndef CONFIG_FIT
31 # define CONFIG_FIT
32--
332.7.0
34