summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-03-24 19:05:03 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-25 10:02:50 +0000
commit1bf1e1539fb72f0bc594b4b2367482dd13c8c633 (patch)
treec88d7ad950daccd7574173a802710759b110cc24 /meta/recipes-kernel
parent659b3f59f771754b5a6aca6f79155e255714db48 (diff)
downloadpoky-1bf1e1539fb72f0bc594b4b2367482dd13c8c633.tar.gz
linux-yocto/5.4: configuration tweaks
Integrating the following configuration fixes: bee554e595e bsp/ti-am65x: remove duplicate config option CONFIG_NETDEVICES 32405486b46 bsp/ti-am335x: drop PRUSS invalid cfg option d40bf6ad14a xilinx-zynqmp: add cpuidle support for zcu102 533cfd5af00 bsp: delete obsolete kernel option CONFIG_MTD_M25P80 (From OE-Core rev: db80305e10d501900e1e371a6f9a4da5cf0b033e) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.4.bb2
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 7037d980d2..9e74ec17af 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
14SRCREV_machine ?= "79037ae58e6b0dfd0c63d4a0e131f1bd5efe7e53" 14SRCREV_machine ?= "79037ae58e6b0dfd0c63d4a0e131f1bd5efe7e53"
15SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" 15SRCREV_meta ?= "bee554e595e49c963900d1c78c01ab2d041382e7"
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.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 2a621622eb..ba5e668d73 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
18SRCREV_machine_qemuarm ?= "5c2d35eeb4be0e8bae4cf5ee0733e41ff1262ff3" 18SRCREV_machine_qemuarm ?= "5c2d35eeb4be0e8bae4cf5ee0733e41ff1262ff3"
19SRCREV_machine ?= "03142acba06e8b33888410a518358a626dceb720" 19SRCREV_machine ?= "03142acba06e8b33888410a518358a626dceb720"
20SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" 20SRCREV_meta ?= "bee554e595e49c963900d1c78c01ab2d041382e7"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${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 0f1cd07945..25e933d683 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 ?= "03142acba06e8b33888410a518358a626dceb720"
21SRCREV_machine_qemux86-64 ?= "03142acba06e8b33888410a518358a626dceb720" 21SRCREV_machine_qemux86-64 ?= "03142acba06e8b33888410a518358a626dceb720"
22SRCREV_machine_qemumips64 ?= "d3e850da830241c424d557a6a072527e09e784ab" 22SRCREV_machine_qemumips64 ?= "d3e850da830241c424d557a6a072527e09e784ab"
23SRCREV_machine ?= "03142acba06e8b33888410a518358a626dceb720" 23SRCREV_machine ?= "03142acba06e8b33888410a518358a626dceb720"
24SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" 24SRCREV_meta ?= "bee554e595e49c963900d1c78c01ab2d041382e7"
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"