From db80305e10d501900e1e371a6f9a4da5cf0b033e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 24 Mar 2020 19:05:03 -0400 Subject: 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 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- 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 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 () { } SRCREV_machine ?= "79037ae58e6b0dfd0c63d4a0e131f1bd5efe7e53" -SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" +SRCREV_meta ?= "bee554e595e49c963900d1c78c01ab2d041382e7" 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.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" SRCREV_machine_qemuarm ?= "5c2d35eeb4be0e8bae4cf5ee0733e41ff1262ff3" SRCREV_machine ?= "03142acba06e8b33888410a518358a626dceb720" -SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" +SRCREV_meta ?= "bee554e595e49c963900d1c78c01ab2d041382e7" PV = "${LINUX_VERSION}+git${SRCPV}" 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" SRCREV_machine_qemux86-64 ?= "03142acba06e8b33888410a518358a626dceb720" SRCREV_machine_qemumips64 ?= "d3e850da830241c424d557a6a072527e09e784ab" SRCREV_machine ?= "03142acba06e8b33888410a518358a626dceb720" -SRCREV_meta ?= "d40bf6ad14acc6d84d5c9a8e2c794ce37ffa16ff" +SRCREV_meta ?= "bee554e595e49c963900d1c78c01ab2d041382e7" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg