diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-11-17 10:24:34 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-09 23:49:01 +0000 |
commit | 2761a972731e6dc2be271ca7caffb435548e2373 (patch) | |
tree | bab9e870e0b9b6f08c475b80c3d0261d2218e742 /meta | |
parent | b097b22d3aab3a051e4355b61929d2daccd56ed6 (diff) | |
download | poky-2761a972731e6dc2be271ca7caffb435548e2373.tar.gz |
linux-yocto/5.4: config cleanup / warnings
Integrating the following commit(s):
eadca496e9f bsp/mti-malta64: fix warning of CONFIG_SCSI_VIRTIO on qemumips64
203911bc035 net/l2tp.cfg: fix CONFIG_PPPOL2TP mismatched warnings
(From OE-Core rev: bffc59b566368b5435381c460f692a07c36db567)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e8df0a1f9607417f3f308b9ff852e287837b6cdf)
Signed-off-by: Steve Sakoman <steve@sakoman.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.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 4d84a3ad09..4abde1265e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "689799c6846313eb19566dd4afb69d30353dd351" | 14 | SRCREV_machine ?= "689799c6846313eb19566dd4afb69d30353dd351" |
15 | SRCREV_meta ?= "8df18409861d25d9ca84b80c9ca8181a48f6ee45" | 15 | SRCREV_meta ?= "e9a115873f55580929b3cd0232a70652666f5fff" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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.4;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 9f17d56b6a..44646ebd84 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "f37a22c3ddab9db618ad302cce77825dae2cda87" | 18 | SRCREV_machine_qemuarm ?= "f37a22c3ddab9db618ad302cce77825dae2cda87" |
19 | SRCREV_machine ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" | 19 | SRCREV_machine ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" |
20 | SRCREV_meta ?= "8df18409861d25d9ca84b80c9ca8181a48f6ee45" | 20 | SRCREV_meta ?= "e9a115873f55580929b3cd0232a70652666f5fff" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 5c908e9d88..7722ef0747 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb | |||
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" | |||
21 | SRCREV_machine_qemux86-64 ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" | 21 | SRCREV_machine_qemux86-64 ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" |
22 | SRCREV_machine_qemumips64 ?= "536bda19159206ac7f60165f71bbf892cb8ad3fd" | 22 | SRCREV_machine_qemumips64 ?= "536bda19159206ac7f60165f71bbf892cb8ad3fd" |
23 | SRCREV_machine ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" | 23 | SRCREV_machine ?= "08b83b0eb0ff8fe7a8dae5aa4ef7f8eec7542806" |
24 | SRCREV_meta ?= "8df18409861d25d9ca84b80c9ca8181a48f6ee45" | 24 | SRCREV_meta ?= "e9a115873f55580929b3cd0232a70652666f5fff" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.4 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.4 kernel |
27 | # KMACHINE_qemuarm ?= "qemuarma15" | 27 | # KMACHINE_qemuarm ?= "qemuarma15" |