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ä <[email protected]> --- meta/recipes-bsp/u-boot/u-boot.inc | 3 +- .../0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-bsp/u-boot/u-boot/0001-am335x_evm.h-unsed-CONFIG_BOOTDELAY.patch diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 41eb205..ac8f338 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" 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 0000000..70c87c4 --- /dev/null +++ b/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 <[email protected]> +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 <[email protected]> + +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 + -- 2.7.0 --------------------------------------------------------------------- Intel Finland Oy Registered Address: PL 281, 00181 Helsinki Business Identity Code: 0357606 - 4 Domiciled in Helsinki This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
