From a934b0f7421734f3d4d15c2e2b45aab40ff8b6d4 Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 18 Dec 2014 17:58:52 +0100
Subject: Update all to latest and greatest U-Boot and Linux kernel.

---
 recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb | 4 ++--
 recipes-bsp/u-boot/u-boot-toradex_git.bb     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'recipes-bsp')

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 c2a4ab9..6873f08 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
@@ -12,9 +12,9 @@ PR = "r0"
 S = "${WORKDIR}/git"
 
 SRCREV_colibri-vf = "d69e7bbceb14e09f0af2cddeb68ee5734a1c2d45"
-SRCBRANCH_colibri-vf = "2014.10-toradex-next"
+SRCBRANCH_colibri-vf = "2014.10-toradex"
 SRCREV_mx6 = "d593e1931d1a9fa00ee99dcd9b61e1c3f738ab1c"
-SRCBRANCH_mx6 = "2014.04-toradex-next"
+SRCBRANCH_mx6 = "2014.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_git.bb b/recipes-bsp/u-boot/u-boot-toradex_git.bb
index 1ad6049..1fa6438 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_git.bb
@@ -21,7 +21,7 @@ SRC_URI_T30 =  "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=201
 # This revision is based on upstream "v2011.06"
 SRCREV_T20 = "278ca22a59e3df4dd1e1494e8920a01c172118af"
 # This revision is based on upstream "v2014.10"
-SRCREV_T30 = "7031ed747021815dd8303d8a70b8c070ba709c56"
+SRCREV_T30 = "d69e7bbceb14e09f0af2cddeb68ee5734a1c2d45"
 
 PV_colibri-t20 = "${PR}+gitr${SRCREV}"
 PV_colibri-t30 = "${PR}+gitr${SRCREV}"
-- 
cgit v1.2.3