From 6673b8a80afd41b3a6c956bf642e50f958c57d87 Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Tue, 3 Nov 2015 02:58:41 +0100
Subject: Update Linux kernel and U-Boot to latest.

---
 recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb | 4 ++--
 recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb          | 4 ++--
 recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend    | 2 +-
 recipes-kernel/linux/linux-toradex-fsl_git.bb         | 8 +++-----
 recipes-kernel/linux/linux-toradex_4.1.bb             | 4 ++--
 5 files changed, 10 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 dd2abf7..41f0df3 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,8 +12,8 @@ DEFAULT_PREFERENCE_colibri-imx6 = "1"
 
 FILESPATHPKG =. "git:"
 S="${WORKDIR}/git"
-SRCREV_colibri-vf = "f9e7649338178f823e291386dde5086ad636b703"
-SRCREV_mx6 = "06ee8db6422e02337242e43b8573359443db59ea"
+SRCREV_colibri-vf = "1ef4a29e8cea0239411dde64f9617ad76248fd02"
+SRCREV_mx6 = "1ef4a29e8cea0239411dde64f9617ad76248fd02"
 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} \
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 5604ffe..119c3df 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
@@ -10,8 +10,8 @@ PR = "r0"
 
 S = "${WORKDIR}/git"
 
-SRCREV_mx6 = "95868835ab8181591446bc3f24a15bf6fbdfd1f5"
-SRCBRANCH_mx6 = "2015.04-toradex-next"
+SRCREV_mx6 = "1ef4a29e8cea0239411dde64f9617ad76248fd02"
+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_2015.04.bbappend b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend
index 8e11b95..ad3b7e6 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend
+++ b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend
@@ -1,2 +1,2 @@
-SRCREV = "f9e7649338178f823e291386dde5086ad636b703"
+SRCREV = "1ef4a29e8cea0239411dde64f9617ad76248fd02"
 SRCBRANCH = "2015.04-toradex"
diff --git a/recipes-kernel/linux/linux-toradex-fsl_git.bb b/recipes-kernel/linux/linux-toradex-fsl_git.bb
index cb4f518..5dd1615 100644
--- a/recipes-kernel/linux/linux-toradex-fsl_git.bb
+++ b/recipes-kernel/linux/linux-toradex-fsl_git.bb
@@ -11,15 +11,13 @@ DEPENDS += "lzop-native "
 
 LINUX_VERSION_mx6 = "3.14.28"
 
-SRCREV_mx6 = "6ef4eef1eb726929d913580b9b24d4f57904dc80"
-PR_mx6 = "V2.5b1"
+SRCREV_mx6 = "77e525493f74f9f2e33a41e9e65b54e810ac3dd0"
+PR_mx6 = "V2.5b2"
 
 PV = "${LINUX_VERSION}+gitr${SRCREV}"
 S = "${WORKDIR}/git"
-SRCBRANCH_mx6 = "toradex_imx_3.14.28_1.0.0_ga-next"
+SRCBRANCH_mx6 = "toradex_imx_3.14.28_1.0.0_ga"
 SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}"
-# a Patch
-# SRC_URI_append_mx6 += "file://a.patch "
 
 COMPATIBLE_MACHINE = "(colibri-imx6|apalis-imx6)"
 
diff --git a/recipes-kernel/linux/linux-toradex_4.1.bb b/recipes-kernel/linux/linux-toradex_4.1.bb
index 1286074..6da8c10 100644
--- a/recipes-kernel/linux/linux-toradex_4.1.bb
+++ b/recipes-kernel/linux/linux-toradex_4.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRAN
 KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
 
 LOCALVERSION = "-v2.5b2"
-SRCBRANCH = "toradex_vf_4.1-next"
-SRCREV = "db6b1f8270757539d90422ee5294bc25ff13a040"
+SRCBRANCH = "toradex_vf_4.1"
+SRCREV = "559570ccdc6555d2228a4e4e9e589e3145d7c2e4"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(vf)"
-- 
cgit v1.2.3