summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-08-24 15:00:38 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-25 01:00:37 +0100
commita7326d994e54dbd43bad4844bec1d4ecdc20dca3 (patch)
tree043232d6374091a72133f1b44ee3db4dd34025d8 /meta
parentcdb0abc90ec07329aba9c11a299d3e9b80048a3f (diff)
downloadpoky-a7326d994e54dbd43bad4844bec1d4ecdc20dca3.tar.gz
linux-yocto/5.8: fix perf and virtio_scsi warnings
Integrating the following commit(s) to linux-yocto/5.8: 5d66d1a67c8d arm64/perf: Fix wrong cast that may cause wrong truncation Khem reported in some configurations that CONFIG_SCSI_VIRTIO was throwing a warning in the final .config. That was due to the fact that if debug or not is enabled, it switches between built-in and a module. Either configuration is correct, so we add it to the non-hardware file to inhibit it being reported by deefault. The following meta branch commit resolves the issue: commit 96e8f5e330f5a8f87deda0f1bae71af31c578ce9 (HEAD -> master) Author: Bruce Ashfield <bruce.ashfield@gmail.com> Date: Sat Aug 22 22:19:13 2020 -0400 virtio: declare CONFIG_SCSI_VIRTIO as non-hw Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> (From OE-Core rev: 74188412ae3019235151f3e606a470ff27c7ed63) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.8.bb20
3 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb
index 6317f8da7b..7b5588f01f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.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 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" 14SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
15SRCREV_meta ?= "196209114496901389e2f9012c0600121fc617e0" 15SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689"
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-5.8;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.8;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb
index 022779f97f..8e7272b54e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "15d5da73971d108241be861b5587949fd56933e9" 18SRCREV_machine_qemuarm ?= "01ca9ab2d6cb0de4425d9dfca99dff30653083d9"
19SRCREV_machine ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" 19SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
20SRCREV_meta ?= "196209114496901389e2f9012c0600121fc617e0" 20SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/meta/recipes-kernel/linux/linux-yocto_5.8.bb
index ea167c1866..e6e1189802 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.8.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.8/standard/base"
12KBRANCH_qemux86-64 ?= "v5.8/standard/base" 12KBRANCH_qemux86-64 ?= "v5.8/standard/base"
13KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64" 13KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64"
14 14
15SRCREV_machine_qemuarm ?= "ca2de8f4027075ca7d7c973c2cc03f7d8b219a43" 15SRCREV_machine_qemuarm ?= "3c532d32043dbe90c159f334d8c4232ca67537cd"
16SRCREV_machine_qemuarm64 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" 16SRCREV_machine_qemuarm64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
17SRCREV_machine_qemumips ?= "5e0205a156d14b6341487a169b75ea45b67007b9" 17SRCREV_machine_qemumips ?= "de93c804ee2e77d32e8a103a68ef19df6947757f"
18SRCREV_machine_qemuppc ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" 18SRCREV_machine_qemuppc ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
19SRCREV_machine_qemuriscv64 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" 19SRCREV_machine_qemuriscv64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
20SRCREV_machine_qemux86 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" 20SRCREV_machine_qemux86 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
21SRCREV_machine_qemux86-64 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" 21SRCREV_machine_qemux86-64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
22SRCREV_machine_qemumips64 ?= "576f92f17434ae7dd027e8d465a32e4119ead4ee" 22SRCREV_machine_qemumips64 ?= "3109e6f363109f0dd4bd6a8647f639e445c533f2"
23SRCREV_machine ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" 23SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
24SRCREV_meta ?= "196209114496901389e2f9012c0600121fc617e0" 24SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689"
25 25
26# remap qemuarm to qemuarma15 for the 5.8 kernel 26# remap qemuarm to qemuarma15 for the 5.8 kernel
27# KMACHINE_qemuarm ?= "qemuarma15" 27# KMACHINE_qemuarm ?= "qemuarma15"