From b7b10668564b8a887b2cf507116af8700cd8bbaf Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Fri, 27 Dec 2019 17:35:40 +0100
Subject: linux kernel & u-boot recipes: update to latest

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 8d3d527425b592480900d006c76694877755486a)
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

Conflicts:
	recipes-kernel/linux/linux-toradex-mainline_4.14.bb
	recipes-kernel/linux/linux-toradex_3.10.40.bb
---
 recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc    | 2 +-
 recipes-kernel/linux/linux-toradex-mainline_4.14.bb | 6 +++---
 recipes-kernel/linux/linux-toradex_3.10.40.bb       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc b/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc
index 907b3f4..70cd0a9 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc
@@ -11,7 +11,7 @@ inherit toradex-u-boot-localversion
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "e1cbe8c74e87036e649b0e34656aebabb3aa00c7"
+SRCREV = "694e2136eefc2d110f44b26218c03e44a1e88235"
 SRCBRANCH = "toradex_2019.07"
 SRCREV_use-head-next = "${AUTOREV}"
 SRCBRANCH_use-head-next = "toradex_2019.07-next"
diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
index 7b26b7f..9cd8e08 100644
--- a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
+++ b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
@@ -11,7 +11,7 @@ inherit kernel siteinfo toradex-kernel-localversion
 # git hash not available since tarball from kernel.org is used
 SCMVERSION = "n"
 
-LINUX_VERSION ?= "4.14.155"
+LINUX_VERSION ?= "4.14.160"
 
 PV = "${LINUX_VERSION}"
 S = "${WORKDIR}/linux-${PV}"
@@ -60,8 +60,8 @@ SRC_URI = " \
     ${GENERIC_PATCHES} \
     ${MACHINE_PATCHES} \
 "
-SRC_URI[md5sum] = "316f8d2b188febef94a98365799d2141"
-SRC_URI[sha256sum] = "77d61979556b81c95b81452fa10e1fe9368cbe2f9f80a13e4669b0464722e481"
+SRC_URI[md5sum] = "286501d9badbb724fddbc6e20e46aa1e"
+SRC_URI[sha256sum] = "c60326bad1bcdede514ca8a0bb96843fa7578ef00829cced6218b888b2efa92c"
 
 # For CI use one could use the following instead (plus patches still of course)
 LINUX_VERSION_use-head-next ?= "4.14"
diff --git a/recipes-kernel/linux/linux-toradex_3.10.40.bb b/recipes-kernel/linux/linux-toradex_3.10.40.bb
index 3438d7f..924fdd2 100644
--- a/recipes-kernel/linux/linux-toradex_3.10.40.bb
+++ b/recipes-kernel/linux/linux-toradex_3.10.40.bb
@@ -8,7 +8,7 @@ inherit kernel siteinfo toradex-kernel-localversion
 
 LINUX_VERSION ?= "3.10.40"
 
-SRCREV = "ad44961f8b3cf5ce342d234c7eca05d89369c26b"
+SRCREV = "5abb34056de22ab2dfcc05cbcd70c90405f8ea4b"
 SRCREV_use-head-next = "${AUTOREV}"
 
 PV = "${LINUX_VERSION}+gitr${SRCPV}"
-- 
cgit v1.2.3