diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-03-24 19:04:59 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-25 10:02:49 +0000 |
| commit | 026440717d15931d3c783d5f312dbc1217e8b75c (patch) | |
| tree | 0e8545df91641fd4d4aaed1959fed9c1d353e4de /meta/recipes-kernel/linux/linux-yocto_5.4.bb | |
| parent | 397a419e490c229f4dcb446ae9c81180aed1d0d4 (diff) | |
| download | poky-026440717d15931d3c783d5f312dbc1217e8b75c.tar.gz | |
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
(From OE-Core rev: 43ec35f7cc4f222ad91efdd56f8eea901db52def)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto_5.4.bb')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 20 |
1 files changed, 10 insertions, 10 deletions
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" | |||
| 12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" | 12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" |
| 13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" | 13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" |
| 14 | 14 | ||
| 15 | SRCREV_machine_qemuarm ?= "e28b25e558cdc53d13f67df8b249bb770f3dcfba" | 15 | SRCREV_machine_qemuarm ?= "e0b9db4dd28cfccc6b0cffd2da6cde7c8d760bdd" |
| 16 | SRCREV_machine_qemuarm64 ?= "20eb96b378204dcc435b193c5d692bdf561beff0" | 16 | SRCREV_machine_qemuarm64 ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7" |
| 17 | SRCREV_machine_qemumips ?= "0e1fe5b6bb2a34ed05dcc69fadec6581cbb0f9f5" | 17 | SRCREV_machine_qemumips ?= "84c43062449817e61dd8e331f49821c65aa23967" |
| 18 | SRCREV_machine_qemuppc ?= "20eb96b378204dcc435b193c5d692bdf561beff0" | 18 | SRCREV_machine_qemuppc ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7" |
| 19 | SRCREV_machine_qemuriscv64 ?= "20eb96b378204dcc435b193c5d692bdf561beff0" | 19 | SRCREV_machine_qemuriscv64 ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7" |
| 20 | SRCREV_machine_qemux86 ?= "20eb96b378204dcc435b193c5d692bdf561beff0" | 20 | SRCREV_machine_qemux86 ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7" |
| 21 | SRCREV_machine_qemux86-64 ?= "20eb96b378204dcc435b193c5d692bdf561beff0" | 21 | SRCREV_machine_qemux86-64 ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7" |
| 22 | SRCREV_machine_qemumips64 ?= "ac5e243548907567d8285492c9fa0cbcf7d35d8a" | 22 | SRCREV_machine_qemumips64 ?= "08ac7d212e539ed2d17c6714d97b019e48e1fe1c" |
| 23 | SRCREV_machine ?= "20eb96b378204dcc435b193c5d692bdf561beff0" | 23 | SRCREV_machine ?= "45760a7e1301894b3ffd4d1bd76684c99fbff6f7" |
| 24 | SRCREV_meta ?= "9fe365b9395a05831177ec309e9857962b2496a9" | 24 | SRCREV_meta ?= "ccf845f650255696bcd41c4004abf8adba212d5d" |
| 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" |