linux-yocto/5.4: Revert "platform/x86: wmi: Destroy on cleanup rather than unregister"

We had reverted this commit in v5.2, and it is still required in 5.4.

The following config commit is also included in this change:

  bsp/ti-am335x: drop some invalid cfg options

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 15 insertions, 15 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 446eae2be6..5bdd2f629a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,8 +11,8 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "2659f7a7212cd80e2b69b2e5e8ceec8bcffec6aa"
-SRCREV_meta ?= "9fe365b9395a05831177ec309e9857962b2496a9"
+SRCREV_machine ?= "b6eb513c50e6de3746287c4f17058a81d1be613c"
+SRCREV_meta ?= "ccf845f650255696bcd41c4004abf8adba212d5d"
 
 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 653f33f9cb..0850725383 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "c90bb8009bf65f13d120f8e4989763f85133762e"
-SRCREV_machine ?= "20eb96b378204dcc435b193c5d692bdf561beff0"
-SRCREV_meta ?= "9fe365b9395a05831177ec309e9857962b2496a9"
+SRCREV_machine_qemuarm ?= "8f0a54b42e11bee3bf552ae6a04f7ec2267f4dd3"
+SRCREV_machine ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7"
+SRCREV_meta ?= "ccf845f650255696bcd41c4004abf8adba212d5d"
 
 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 d3fed81c56..98e4accc74 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86  ?= "v5.4/standard/base"
 KBRANCH_qemux86-64 ?= "v5.4/standard/base"
 KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e28b25e558cdc53d13f67df8b249bb770f3dcfba"
-SRCREV_machine_qemuarm64 ?= "20eb96b378204dcc435b193c5d692bdf561beff0"
-SRCREV_machine_qemumips ?= "0e1fe5b6bb2a34ed05dcc69fadec6581cbb0f9f5"
-SRCREV_machine_qemuppc ?= "20eb96b378204dcc435b193c5d692bdf561beff0"
-SRCREV_machine_qemuriscv64 ?= "20eb96b378204dcc435b193c5d692bdf561beff0"
-SRCREV_machine_qemux86 ?= "20eb96b378204dcc435b193c5d692bdf561beff0"
-SRCREV_machine_qemux86-64 ?= "20eb96b378204dcc435b193c5d692bdf561beff0"
-SRCREV_machine_qemumips64 ?= "ac5e243548907567d8285492c9fa0cbcf7d35d8a"
-SRCREV_machine ?= "20eb96b378204dcc435b193c5d692bdf561beff0"
-SRCREV_meta ?= "9fe365b9395a05831177ec309e9857962b2496a9"
+SRCREV_machine_qemuarm ?= "e0b9db4dd28cfccc6b0cffd2da6cde7c8d760bdd"
+SRCREV_machine_qemuarm64 ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7"
+SRCREV_machine_qemumips ?= "84c43062449817e61dd8e331f49821c65aa23967"
+SRCREV_machine_qemuppc ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7"
+SRCREV_machine_qemuriscv64 ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7"
+SRCREV_machine_qemux86 ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7"
+SRCREV_machine_qemux86-64 ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7"
+SRCREV_machine_qemumips64 ?= "08ac7d212e539ed2d17c6714d97b019e48e1fe1c"
+SRCREV_machine ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7"
+SRCREV_meta ?= "ccf845f650255696bcd41c4004abf8adba212d5d"
 
 # remap qemuarm to qemuarma15 for the 5.4 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"