diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-10-12 13:38:58 -0400 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-10-25 04:51:01 -1000 |
commit | 5c5eecadd7a00f806912b6ae93a71df9bace0fd3 (patch) | |
tree | d2be88e1f602273bf137e8326488c857dc7d0957 | |
parent | 2107d810d4a8ef37684a2d09bff3af64bfd28a00 (diff) | |
download | poky-5c5eecadd7a00f806912b6ae93a71df9bace0fd3.tar.gz |
linux-yocto/6.1: tiny: fix arm 32 boot
Integrating the following commit(s) to linux-yocto/.:
0816d0a6984 qemuarma15: add ARM_PATCH_PHYS_VIRT
(From OE-Core rev: 80dd08fb9685ae04e4c9f99d9dd32d9044efe8f2)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 732d1ee4bc824cb52fab4327601efdb1558b6d9c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index ab6dbdb52d..bd782d1b09 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | |||
@@ -15,7 +15,7 @@ python () { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "4b3040c1dc13aaac356ad4ef45a8926118c732d0" | 17 | SRCREV_machine ?= "4b3040c1dc13aaac356ad4ef45a8926118c732d0" |
18 | SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" | 18 | SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" |
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 \ |
21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" | 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 29459fabed..11d87d23a7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | |||
@@ -18,7 +18,7 @@ KMETA = "kernel-meta" | |||
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
19 | 19 | ||
20 | SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" | 20 | SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" |
21 | SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" | 21 | SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git${SRCPV}" | 23 | PV = "${LINUX_VERSION}+git${SRCPV}" |
24 | 24 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 21e22c887e..03cecb2da1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb | |||
@@ -28,7 +28,7 @@ SRCREV_machine:qemux86 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" | |||
28 | SRCREV_machine:qemux86-64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" | 28 | SRCREV_machine:qemux86-64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" |
29 | SRCREV_machine:qemumips64 ?= "aa0e978c979b84d620ad21132cfdbbf857be3878" | 29 | SRCREV_machine:qemumips64 ?= "aa0e978c979b84d620ad21132cfdbbf857be3878" |
30 | SRCREV_machine ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" | 30 | SRCREV_machine ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" |
31 | SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" | 31 | SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" |
32 | 32 | ||
33 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 33 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
34 | # get the <version>/base branch, which is pure upstream -stable, and the same | 34 | # get the <version>/base branch, which is pure upstream -stable, and the same |