summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-11-28 17:03:37 -0800
committerMax Krummenacher <max.krummenacher@toradex.com>2017-03-14 14:09:18 +0100
commitafa46eed44a4576e69ee4921c69be57ebb3d867c (patch)
tree9c08f119a0e7a6b5c773f3c6f112758167804ed2
parentc7a6bdbc5630eed3c958d5e65f2fec02cad905d3 (diff)
colibri-imx7: update to latest -next branches
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend4
-rw-r--r--recipes-kernel/linux/linux-toradex_4.1.15.bb4
2 files changed, 4 insertions, 4 deletions
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 6922e58..3aa1016 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend
+++ b/recipes-bsp/u-boot/u-boot-toradex_2015.04.bbappend
@@ -1,6 +1,6 @@
PV = "v2015.04-v2.6.1b1+git${SRCPV}"
-SRCREV = "46aa70c402efec7d89f6c93531a767a1771e2192"
-SRCBRANCH = "2015.04-toradex"
+SRCREV = "3ef74c1697575cec3822efc04a625f60d057f401"
+SRCBRANCH = "2015.04-toradex-next"
COMPATIBLE_MACHINE = "(mx6|mx7|vf)"
diff --git a/recipes-kernel/linux/linux-toradex_4.1.15.bb b/recipes-kernel/linux/linux-toradex_4.1.15.bb
index a72cc95..d56e6ac 100644
--- a/recipes-kernel/linux/linux-toradex_4.1.15.bb
+++ b/recipes-kernel/linux/linux-toradex_4.1.15.bb
@@ -10,8 +10,8 @@ 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.6.1b1"
-SRCBRANCH = "toradex_imx_4.1.15_1.0.0_ga"
-SRCREV = "bef7a90406b663a74aaaf06bdccc56285d9fe93c"
+SRCBRANCH = "toradex_imx_4.1.15_1.0.0_ga-next"
+SRCREV = "4bfb39bdd76124c1cfdc41d1975c51553132d573"
DEPENDS += "lzop-native bc-native"
COMPATIBLE_MACHINE = "(mx7)"