summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-12-16 22:38:15 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-18 16:19:33 +0000
commitb30a1f3866ebdb65e87ed95da413ce51c1a1784d (patch)
tree05ccfc2d83d3ed435bae57ba886701a908a20f93
parent0c40c20b5737fc3ec9babb2e0e336cd851c912a5 (diff)
downloadpoky-b30a1f3866ebdb65e87ed95da413ce51c1a1784d.tar.gz
linux-yocto/4.18: -rt sync and config cleanups
Integrating the following -rt patches: cab37ca8426b rt: update localversion to match latest content 186274b2b6dc tty: serial: pl011: explicitly initialize the flags variable ac121b7124a0 mm/kasan: make quarantine_lock a raw_spinlock_t 6100773500e7 watchdog: prevent deferral of watchdogd wakeup on RT ce594291c4eb kthread: convert worker lock to raw spinlock And the following configuration tweaks: e39413ec2bdd sound.cfg: enable SND_SOC_INTEL_SKYLAKE (From OE-Core rev: a757e0638e8411fe6b4c58f3840ee27d49feb97e) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.18.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
index b30c9ac149..2a92a69b5f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
@@ -11,8 +11,8 @@ python () {
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "8e00c30ce22f378ecb7f243b1df3d209b8ee29bc" 14SRCREV_machine ?= "cab37ca8426b490e995a9614f15448e135399993"
15SRCREV_meta ?= "0a45d79311edece055050075b13ac7e273bc0695" 15SRCREV_meta ?= "e39413ec2bdda10cdfb7e7e4df228be8d39e6639"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
index a7fe7e9a0e..e94dcd5bb3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
@@ -14,7 +14,7 @@ KMETA = "kernel-meta"
14KCONF_BSP_AUDIT_LEVEL = "2" 14KCONF_BSP_AUDIT_LEVEL = "2"
15 15
16SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 16SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7"
17SRCREV_meta ?= "0a45d79311edece055050075b13ac7e273bc0695" 17SRCREV_meta ?= "e39413ec2bdda10cdfb7e7e4df228be8d39e6639"
18 18
19PV = "${LINUX_VERSION}+git${SRCPV}" 19PV = "${LINUX_VERSION}+git${SRCPV}"
20 20
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
index 5dc772addb..da0f076c92 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "33859b3077c83d8a024946ba06a59990546fcbc7"
19SRCREV_machine_qemux86-64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 19SRCREV_machine_qemux86-64 ?= "33859b3077c83d8a024946ba06a59990546fcbc7"
20SRCREV_machine_qemumips64 ?= "6d91dc62811f4688efc67845185858645b4ccfb8" 20SRCREV_machine_qemumips64 ?= "6d91dc62811f4688efc67845185858645b4ccfb8"
21SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7" 21SRCREV_machine ?= "33859b3077c83d8a024946ba06a59990546fcbc7"
22SRCREV_meta ?= "0a45d79311edece055050075b13ac7e273bc0695" 22SRCREV_meta ?= "e39413ec2bdda10cdfb7e7e4df228be8d39e6639"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"