From 74188412ae3019235151f3e606a470ff27c7ed63 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 24 Aug 2020 15:00:38 -0400 Subject: 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 Date: Sat Aug 22 22:19:13 2020 -0400 virtio: declare CONFIG_SCSI_VIRTIO as non-hw Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_5.8.bb | 20 ++++++++++---------- 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 () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" -SRCREV_meta ?= "196209114496901389e2f9012c0600121fc617e0" +SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "15d5da73971d108241be861b5587949fd56933e9" -SRCREV_machine ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" -SRCREV_meta ?= "196209114496901389e2f9012c0600121fc617e0" +SRCREV_machine_qemuarm ?= "01ca9ab2d6cb0de4425d9dfca99dff30653083d9" +SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689" PV = "${LINUX_VERSION}+git${SRCPV}" 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" KBRANCH_qemux86-64 ?= "v5.8/standard/base" KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ca2de8f4027075ca7d7c973c2cc03f7d8b219a43" -SRCREV_machine_qemuarm64 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" -SRCREV_machine_qemumips ?= "5e0205a156d14b6341487a169b75ea45b67007b9" -SRCREV_machine_qemuppc ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" -SRCREV_machine_qemuriscv64 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" -SRCREV_machine_qemux86 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" -SRCREV_machine_qemux86-64 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" -SRCREV_machine_qemumips64 ?= "576f92f17434ae7dd027e8d465a32e4119ead4ee" -SRCREV_machine ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329" -SRCREV_meta ?= "196209114496901389e2f9012c0600121fc617e0" +SRCREV_machine_qemuarm ?= "3c532d32043dbe90c159f334d8c4232ca67537cd" +SRCREV_machine_qemuarm64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_machine_qemumips ?= "de93c804ee2e77d32e8a103a68ef19df6947757f" +SRCREV_machine_qemuppc ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_machine_qemuriscv64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_machine_qemux86 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_machine_qemux86-64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_machine_qemumips64 ?= "3109e6f363109f0dd4bd6a8647f639e445c533f2" +SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3" +SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg