summaryrefslogtreecommitdiff
path: root/recipes-kernel
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-11-03 02:58:41 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-11-03 02:58:41 +0100
commit743ceb014ab697552c61e8c5345f3a470ec93edf (patch)
tree283172d256bc3c07fd775d47b516dac222df96da /recipes-kernel
parent14f270cf9a896c491ce204043df8555186472919 (diff)
Update Linux kernel and U-Boot to latest.
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-toradex-fsl_git.bb8
-rw-r--r--recipes-kernel/linux/linux-toradex_4.1.bb4
2 files changed, 5 insertions, 7 deletions
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)"