diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-10-19 11:08:49 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-19 17:01:04 +0100 |
commit | 157e13d4a0bbde395759290d8c090dc9a906c35b (patch) | |
tree | 836edf5d12667b3a3daaa2e98c8c37cdee1ed038 /meta | |
parent | 482c4d0a95115581de545d917885b7ef923680d8 (diff) | |
download | poky-157e13d4a0bbde395759290d8c090dc9a906c35b.tar.gz |
linux-yocto/6.5: serial: core: integrate upstream fixes
Integrating the following commit(s) to linux-yocto/6.5:
14f83e409308 serial: core: test for -EINPROGRESS during tx power management validation
1b5b735f311f serial: core: Fix checks for tx runtime PM state
dee98a75d75c Revert "serial-core: disable power managment for serial tx"
(From OE-Core rev: 4c9a85ed1d69e55963cd77122e5c869b30f3dbe4)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.5.bb | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb index 985490e5e5..598280c5b6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | |||
@@ -14,7 +14,7 @@ python () { | |||
14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "541ff832e9f2a168145f96ff41857a6cf1c74289" | 17 | SRCREV_machine ?= "2aa14dbb8520e59358778a80b32d7ccf6dd6c2ac" |
18 | SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784" | 18 | SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784" |
19 | 19 | ||
20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb index e2214851ab..b047ab340b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | |||
@@ -17,7 +17,7 @@ DEPENDS += "openssl-native util-linux-native" | |||
17 | KMETA = "kernel-meta" | 17 | KMETA = "kernel-meta" |
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
19 | 19 | ||
20 | SRCREV_machine ?= "8ad515e79001700d5e3d36e6ffe37ebdae2b5cd4" | 20 | SRCREV_machine ?= "dfe7f47645429e162819c3d5690d8f5052f5b5a3" |
21 | SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784" | 21 | SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb b/meta/recipes-kernel/linux/linux-yocto_6.5.bb index bd99b54bce..516605c587 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb | |||
@@ -18,17 +18,17 @@ KBRANCH:qemux86-64 ?= "v6.5/standard/base" | |||
18 | KBRANCH:qemuloongarch64 ?= "v6.5/standard/base" | 18 | KBRANCH:qemuloongarch64 ?= "v6.5/standard/base" |
19 | KBRANCH:qemumips64 ?= "v6.5/standard/mti-malta64" | 19 | KBRANCH:qemumips64 ?= "v6.5/standard/mti-malta64" |
20 | 20 | ||
21 | SRCREV_machine:qemuarm ?= "e3bd53c181eb362535991bb0e0c15bf7b8b8e86f" | 21 | SRCREV_machine:qemuarm ?= "04942abac8568705f1fae34066db171b6e2669bd" |
22 | SRCREV_machine:qemuarm64 ?= "cd01efb6992e0af5dfef251420291d5984898a9c" | 22 | SRCREV_machine:qemuarm64 ?= "ea4b620f18f882b3d882a53ffa33d8125ab27c83" |
23 | SRCREV_machine:qemuloongarch64 ?= "79a314e29b53062b4dfd316569d5480ee0d19249" | 23 | SRCREV_machine:qemuloongarch64 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f" |
24 | SRCREV_machine:qemumips ?= "76f1c7370493dd6068f6733eb7d6ff9da6e7fae8" | 24 | SRCREV_machine:qemumips ?= "3348b580e3c47da56ce97a8297a574c2e37bc410" |
25 | SRCREV_machine:qemuppc ?= "a3ac3f52f2352476f0fb1b0b4fe7b1c2339f9b18" | 25 | SRCREV_machine:qemuppc ?= "2fd47e07960edcd21455548ac6a25b19babe5c10" |
26 | SRCREV_machine:qemuriscv64 ?= "79a314e29b53062b4dfd316569d5480ee0d19249" | 26 | SRCREV_machine:qemuriscv64 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f" |
27 | SRCREV_machine:qemuriscv32 ?= "79a314e29b53062b4dfd316569d5480ee0d19249" | 27 | SRCREV_machine:qemuriscv32 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f" |
28 | SRCREV_machine:qemux86 ?= "79a314e29b53062b4dfd316569d5480ee0d19249" | 28 | SRCREV_machine:qemux86 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f" |
29 | SRCREV_machine:qemux86-64 ?= "79a314e29b53062b4dfd316569d5480ee0d19249" | 29 | SRCREV_machine:qemux86-64 ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f" |
30 | SRCREV_machine:qemumips64 ?= "59ac3aaf836bd355d0f9f734e7bcca3dde44573a" | 30 | SRCREV_machine:qemumips64 ?= "6706327d870a0f246df8ed20c6a7f51ef46db1d6" |
31 | SRCREV_machine ?= "79a314e29b53062b4dfd316569d5480ee0d19249" | 31 | SRCREV_machine ?= "14f83e40930806c3f5c61988e69a3ca1820a1b8f" |
32 | SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784" | 32 | SRCREV_meta ?= "9af846da534077c91e3c42242fceba7aef8dd784" |
33 | 33 | ||
34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |