diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-10-12 13:38:58 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-13 11:53:06 +0100 |
| commit | d309dfe4cedb01e6250a1299b9bcce8e8aaae1e7 (patch) | |
| tree | 207b6442b16a0f0f9c5e1571e96f358cdbb5fafb | |
| parent | 4b52a3f18ce58bfa1b796143c1e7495f183b5e7f (diff) | |
| download | poky-d309dfe4cedb01e6250a1299b9bcce8e8aaae1e7.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: 732d1ee4bc824cb52fab4327601efdb1558b6d9c)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 4e40b021d3..a958ade392 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 9cc3a09247..fd69408873 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" | 23 | PV = "${LINUX_VERSION}+git" |
| 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 b2cb763490..9c9b960f97 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb | |||
| @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" | |||
| 29 | SRCREV_machine:qemux86-64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" | 29 | SRCREV_machine:qemux86-64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" |
| 30 | SRCREV_machine:qemumips64 ?= "aa0e978c979b84d620ad21132cfdbbf857be3878" | 30 | SRCREV_machine:qemumips64 ?= "aa0e978c979b84d620ad21132cfdbbf857be3878" |
| 31 | SRCREV_machine ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" | 31 | SRCREV_machine ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" |
| 32 | SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" | 32 | SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" |
| 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 |
| 35 | # get the <version>/base branch, which is pure upstream -stable, and the same | 35 | # get the <version>/base branch, which is pure upstream -stable, and the same |
