From f2fa49d9d19e1cf60abf8ecbe55de78cb565e0a6 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Mon, 18 May 2015 11:37:16 +0200
Subject: Apalis/Colibri: update U-Boot to latest

And use 2015.04-toradex branch
---
 recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb | 8 ++++----
 recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb          | 8 ++++----
 recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb     | 4 ++--
 recipes-bsp/u-boot/u-boot-toradex_git.bb              | 4 ++--
 4 files changed, 12 insertions(+), 12 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 7555202..6a03181 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
@@ -12,10 +12,10 @@ DEFAULT_PREFERENCE_colibri-imx6 = "1"
 
 FILESPATHPKG =. "git:"
 S="${WORKDIR}/git"
-SRCREV_colibri-vf = "0de8d62ff5cb24d72206d9bee5ad42d517ee530e"
-SRCREV_mx6 = "0de8d62ff5cb24d72206d9bee5ad42d517ee530e"
-SRCBRANCH_colibri-vf = "2015.04-toradex-next"
-SRCBRANCH_mx6 = "2015.04-toradex-next"
+SRCREV_colibri-vf = "06ee8db6422e02337242e43b8573359443db59ea"
+SRCREV_mx6 = "06ee8db6422e02337242e43b8573359443db59ea"
+SRCBRANCH_colibri-vf = "2015.04-toradex"
+SRCBRANCH_mx6 = "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-fsl_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
index 558fb73..db7d276 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
@@ -10,10 +10,10 @@ PR = "r0"
 
 S = "${WORKDIR}/git"
 
-SRCREV_colibri-vf = "0de8d62ff5cb24d72206d9bee5ad42d517ee530e"
-SRCBRANCH_colibri-vf = "2015.04-toradex-next"
-SRCREV_mx6 = "0de8d62ff5cb24d72206d9bee5ad42d517ee530e"
-SRCBRANCH_mx6 = "2015.04-toradex-next"
+SRCREV_colibri-vf = "06ee8db6422e02337242e43b8573359443db59ea"
+SRCBRANCH_colibri-vf = "2015.04-toradex"
+SRCREV_mx6 = "06ee8db6422e02337242e43b8573359443db59ea"
+SRCBRANCH_mx6 = "2015.04-toradex"
 SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}"
 
 #FILESPATHPKG =. "git:"
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 7cb73ba..4226958 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
@@ -13,10 +13,10 @@ DEFAULT_PREFERENCE_colibri-t30 = "1"
 
 FILESPATHPKG =. "git:"
 S="${WORKDIR}/git"
-SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=2015.04-toradex-next"
+SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=2015.04-toradex"
 SRC_URI += "file://fw_env.config"
 # This revision is based on upstream "v2015.04"
-SRCREV = "0de8d62ff5cb24d72206d9bee5ad42d517ee530e"
+SRCREV = "06ee8db6422e02337242e43b8573359443db59ea"
 
 PV_apalis-t30 = "${PR}+gitr${SRCREV}"
 PV_colibri-t20 = "${PR}+gitr${SRCREV}"
diff --git a/recipes-bsp/u-boot/u-boot-toradex_git.bb b/recipes-bsp/u-boot/u-boot-toradex_git.bb
index bd95535..7e7b79e 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_git.bb
@@ -14,9 +14,9 @@ DEFAULT_PREFERENCE_colibri-t30 = "1"
 
 FILESPATHPKG =. "git:"
 S="${WORKDIR}/git"
-SRC_URI =  "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=2015.04-toradex-next"
+SRC_URI =  "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=2015.04-toradex"
 # This revision is based on upstream "v2015.04"
-SRCREV = "0de8d62ff5cb24d72206d9bee5ad42d517ee530e"
+SRCREV = "06ee8db6422e02337242e43b8573359443db59ea"
 
 PV = "${PR}+gitr${SRCREV}"
 
-- 
cgit v1.2.3