From 6f227b5a43a152302fa4a27d09dfc8ce06de4cb0 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Mon, 6 Jun 2016 19:05:07 -0700
Subject: u-boot, u-boot-fw-utils: update to latest

The upgrade is required to match to the latest update scripts which
deploy the kernel and device tree into static UBI volumes.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb | 4 ++--
 recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb     | 4 ++--
 recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend    | 6 +++---
 recipes-bsp/u-boot/u-boot-toradex_git.bb              | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
index 753a1c6..7055dbb 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
@@ -13,8 +13,8 @@ DEFAULT_PREFERENCE_colibri-vf = "1"
 
 FILESPATHPKG =. "git:"
 S="${WORKDIR}/git"
-SRCREV = "e1a48b27907ae3f4592de43d42939a654aed9533"
-SRCBRANCH = "2015.04-toradex-next"
+SRCREV = "10bc451b6948e842e24799fe7fb037d335714b36"
+SRCBRANCH = "2015.04-toradex"
 SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH} \
            file://fw_env.config \
 "
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb
index c798317..548a674 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb
@@ -14,8 +14,8 @@ DEFAULT_PREFERENCE_colibri-t30 = "1"
 FILESPATHPKG =. "git:"
 S="${WORKDIR}/git"
 # This revision is based on upstream "v2015.04"
-SRCREV = "e1a48b27907ae3f4592de43d42939a654aed9533"
-SRCBRANCH = "2015.04-toradex-next"
+SRCREV = "10bc451b6948e842e24799fe7fb037d335714b36"
+SRCBRANCH = "2015.04-toradex"
 SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH} \
            file://fw_env.config \
 "
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend
index 2482ed5..a6e6f24 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend
+++ b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend
@@ -1,6 +1,6 @@
-PV = "v2015.04-v2.6b1+git${SRCPV}"
+PV = "v2015.04-v2.6b2+git${SRCPV}"
 
-SRCREV = "e1a48b27907ae3f4592de43d42939a654aed9533"
-SRCBRANCH = "2015.04-toradex-next"
+SRCREV = "10bc451b6948e842e24799fe7fb037d335714b36"
+SRCBRANCH = "2015.04-toradex"
 
 COMPATIBLE_MACHINE = "(mx6|mx7|vf)"
diff --git a/recipes-bsp/u-boot/u-boot-toradex_git.bb b/recipes-bsp/u-boot/u-boot-toradex_git.bb
index c457546..b7dfc9a 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_git.bb
@@ -15,8 +15,8 @@ DEFAULT_PREFERENCE_colibri-t30 = "1"
 FILESPATHPKG =. "git:"
 S="${WORKDIR}/git"
 # This revision is based on upstream "v2015.04"
-SRCREV = "e1a48b27907ae3f4592de43d42939a654aed9533"
-SRCBRANCH = "2015.04-toradex-next"
+SRCREV = "10bc451b6948e842e24799fe7fb037d335714b36"
+SRCBRANCH = "2015.04-toradex"
 SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}"
 
 PV = "${PR}+gitr${SRCREV}"
-- 
cgit v1.2.3