From c8d1f48a9a01ac5ceb2dbdafe7ccdc0e5aa04f3f Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 31 Mar 2014 11:16:36 +0200
Subject: [PATCH] meta-digi-arm: specify branch for git-based SRC_URI

This fix an error building 'nvram' for ccardimx28js:

ERROR: Fetcher failure: Unable to find revision ... in branch master even from
upstream

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc | 4 +++-
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc
index 0e7d8f714..ccc0d9daa 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2009.08.inc
@@ -1,11 +1,13 @@
 # Copyright (C) 2013 Digi International
 
+SRCBRANCH = "master"
+
 SRCREV_external = ""
 SRCREV_internal = "bd56e767e8fafc3b663877ba4c7009f706389acd"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git"
-SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git"
+SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
 SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 
 UBOOT_NVRAM_LIBPATH = "git/common/digi/cmd_nvram/lib"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
index e6d28b4f2..bc46523e0 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc
@@ -1,11 +1,13 @@
 # Copyright (C) 2013 Digi International
 
+SRCBRANCH = "v2013.01/master"
+
 SRCREV_external = ""
 SRCREV_internal = "958e055c9e4c0b3092097a865335bc743c2abce1"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-uboot.git;protocol=git"
-SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git"
+SRC_URI_internal = "${DIGI_GIT}u-boot-denx.git;protocol=git;branch=${SRCBRANCH}"
 SRC_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}"
 
 UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib"