summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-11-17 10:24:35 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-29 00:07:57 +0000
commitfd3e68b3550fba4cd78942028b3035572e0bb191 (patch)
tree97d0fca9ccdd001d5344d4b57c913eff0ec844f7
parent678eafa74d041de089e319d3bea30baba2ece3f5 (diff)
downloadpoky-fd3e68b3550fba4cd78942028b3035572e0bb191.tar.gz
linux-yocto/5.8: config cleanup / warnings
Integrating the following commit(s) to: d5ca337b7e9 bsp/mti-malta64: fix warning of CONFIG_SCSI_VIRTIO on qemumips64 63c7a70c90f net/l2tp.cfg: fix CONFIG_PPPOL2TP mismatched warnings (From OE-Core rev: f74584cfafccad63967ff8ae63bf3375f5e2c274) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit bc51dcff0b23827fc05a6203c889154616f48014) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.8.bb2
3 files changed, 3 insertions, 3 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 8b6a742834..d0f3ecb8c8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "d0ff030adc1f65129e29c7110c9be2adaa0533f2" 14SRCREV_machine ?= "d0ff030adc1f65129e29c7110c9be2adaa0533f2"
15SRCREV_meta ?= "cc4fd81dde0725d813f988fe3dd4787d2084f997" 15SRCREV_meta ?= "d5ca337b7e9b5834c83b629b5456bb4744efa644"
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 5045f6aa5a..536bc26c5e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "c548e45d83f9cdf224d2a7e318d68aecf390f3bd" 18SRCREV_machine_qemuarm ?= "c548e45d83f9cdf224d2a7e318d68aecf390f3bd"
19SRCREV_machine ?= "d0ff030adc1f65129e29c7110c9be2adaa0533f2" 19SRCREV_machine ?= "d0ff030adc1f65129e29c7110c9be2adaa0533f2"
20SRCREV_meta ?= "cc4fd81dde0725d813f988fe3dd4787d2084f997" 20SRCREV_meta ?= "d5ca337b7e9b5834c83b629b5456bb4744efa644"
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 d4f780ce44..c468170968 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.8.bb
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "d0ff030adc1f65129e29c7110c9be2adaa0533f2"
21SRCREV_machine_qemux86-64 ?= "d0ff030adc1f65129e29c7110c9be2adaa0533f2" 21SRCREV_machine_qemux86-64 ?= "d0ff030adc1f65129e29c7110c9be2adaa0533f2"
22SRCREV_machine_qemumips64 ?= "a92b9df163d6e6b05bf1e7137d6868760537f326" 22SRCREV_machine_qemumips64 ?= "a92b9df163d6e6b05bf1e7137d6868760537f326"
23SRCREV_machine ?= "d0ff030adc1f65129e29c7110c9be2adaa0533f2" 23SRCREV_machine ?= "d0ff030adc1f65129e29c7110c9be2adaa0533f2"
24SRCREV_meta ?= "cc4fd81dde0725d813f988fe3dd4787d2084f997" 24SRCREV_meta ?= "d5ca337b7e9b5834c83b629b5456bb4744efa644"
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"