From ebbe0e6d3eb27ab8b8a3f5e292251d78277be7d8 Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Tue, 19 Jul 2016 18:03:09 +0200 Subject: [PATCH] Revert "meta-digi-arm: u-boot: use v2015.04 maintenance branch" The correct U-Boot branch to be used with dey-2.0/master is v2015.04/master, as it contains the latest development changes (just like dey-2.0/master). This reverts commit 728619a5bc1633cc829b3455fbb8f18ce01c9d0f. --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index be5e8fbdc..fbd22bc93 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -11,7 +11,8 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', PROVIDES += "u-boot" -SRCBRANCH = "v2015.04/maint" +SRCBRANCH = "v2015.04/master" +SRCBRANCH_ccimx6ul = "v2015.04/master" SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo