summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-12-18 17:58:52 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2014-12-18 17:58:52 +0100
commit14c4fd1a731446bd35c820b09ad19f0d99968df4 (patch)
tree36d4240b9ceca34ae25a941cba361932e8dfd92b
parent1302f284bceb18f5837b51ae698bcc6f15c47ed3 (diff)
Update all to latest and greatest U-Boot and Linux kernel.
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb4
-rw-r--r--recipes-kernel/linux/linux-toradex-fsl_git.bb2
-rw-r--r--recipes-kernel/linux/linux-toradex-vf_3.18.bb4
3 files changed, 5 insertions, 5 deletions
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-kernel/linux/linux-toradex-fsl_git.bb b/recipes-kernel/linux/linux-toradex-fsl_git.bb
index 54ddb13..991a965 100644
--- a/recipes-kernel/linux/linux-toradex-fsl_git.bb
+++ b/recipes-kernel/linux/linux-toradex-fsl_git.bb
@@ -20,7 +20,7 @@ PR_mx6 = "V2.3b5"
PV = "${LINUX_VERSION}+gitr${SRCREV}"
S = "${WORKDIR}/git"
SRCBRANCH_colibri-vf = "colibri_vf"
-SRCBRANCH_mx6 = "toradex_imx_3.10.17_1.0.0_ga-next"
+SRCBRANCH_mx6 = "toradex_imx_3.10.17_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 "
diff --git a/recipes-kernel/linux/linux-toradex-vf_3.18.bb b/recipes-kernel/linux/linux-toradex-vf_3.18.bb
index e0cba0a..73c40d7 100644
--- a/recipes-kernel/linux/linux-toradex-vf_3.18.bb
+++ b/recipes-kernel/linux/linux-toradex-vf_3.18.bb
@@ -7,7 +7,7 @@ SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRAN
file://defconfig"
LOCALVERSION = "-v2.3b5"
-SRCBRANCH = "toradex_vf_3.18-next"
-SRCREV = "${AUTOREV}"
+SRCBRANCH = "toradex_vf_3.18"
+SRCREV = "068ecdab500e551f313cd6b08dccc32c9d55e137"
DEPENDS += "lzop-native bc-native"
COMPATIBLE_MACHINE = "(colibri-vf)"