summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2016-06-04 14:11:21 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2016-06-30 13:28:27 +0200
commitba59a33d3946b60da51a5fbae909a82812186596 (patch)
treeb4f1a7ee8198bee17a1438d63593ec779f9472d1
parentc97e5007547402c489d753b19130c624915763b0 (diff)
linux-toradex: update to latest -next
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig1
-rw-r--r--recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig1
-rw-r--r--recipes-kernel/linux/linux-toradex_3.14.52.bb2
-rw-r--r--recipes-kernel/linux/linux-toradex_4.4.bb4
4 files changed, 5 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig
index be234fa..cb596a2 100644
--- a/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig
+++ b/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig
@@ -195,6 +195,7 @@ CONFIG_VIDEO_MXC_CAPTURE=m
CONFIG_MXC_CAMERA_OV5640=m
CONFIG_MXC_CAMERA_OV5642=m
CONFIG_MXC_CAMERA_OV5640_MIPI=m
+CONFIG_MXC_TVIN_ADV7280=m
CONFIG_MXC_TVIN_ADV7180=m
CONFIG_MXC_TVIN_MAX9526=m
CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
diff --git a/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig
index 535f89a..beb14c6 100644
--- a/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig
+++ b/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig
@@ -190,6 +190,7 @@ CONFIG_VIDEO_MXC_CAPTURE=m
CONFIG_MXC_CAMERA_OV5640=m
CONFIG_MXC_CAMERA_OV5642=m
CONFIG_MXC_CAMERA_OV5640_MIPI=m
+CONFIG_MXC_TVIN_ADV7280=m
CONFIG_MXC_TVIN_ADV7180=m
CONFIG_MXC_TVIN_MAX9526=m
CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
diff --git a/recipes-kernel/linux/linux-toradex_3.14.52.bb b/recipes-kernel/linux/linux-toradex_3.14.52.bb
index 2d23681..fb0ce98 100644
--- a/recipes-kernel/linux/linux-toradex_3.14.52.bb
+++ b/recipes-kernel/linux/linux-toradex_3.14.52.bb
@@ -11,7 +11,7 @@ KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget'
LOCALVERSION = "-v2.6b2"
SRCBRANCH = "toradex_imx_3.14.52_1.1.0_ga-next"
-SRCREV = "9ace52b11aca9bbb657a35612c72c83c85b7e92c"
+SRCREV = "809ab9ed4a2118d139c70b44c47ad370ff686f23"
DEPENDS += "lzop-native bc-native"
COMPATIBLE_MACHINE = "(mx6|mx7)"
diff --git a/recipes-kernel/linux/linux-toradex_4.4.bb b/recipes-kernel/linux/linux-toradex_4.4.bb
index 7706c4d..349794d 100644
--- a/recipes-kernel/linux/linux-toradex_4.4.bb
+++ b/recipes-kernel/linux/linux-toradex_4.4.bb
@@ -8,8 +8,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.6b1"
+LOCALVERSION = "-v2.6b2"
SRCBRANCH = "toradex_vf_4.4-next"
-SRCREV = "88c66ffd8ed6cd50e436ce0d5830cd27f93259a2"
+SRCREV = "7e5ae46415e2096f9988f4e050d2bbeff8d6f718"
DEPENDS += "lzop-native bc-native"
COMPATIBLE_MACHINE = "(vf)"