summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-04-28 09:47:47 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-01 21:57:34 +0100
commit5f2879efd0c5368e8baf81ba17387da985c23c68 (patch)
tree386d2dcb525578c080efc3d5d7ddae1b3160dde7 /meta
parent1a4c1c855775ee37ba8019df2283161b5b41dbaa (diff)
downloadpoky-5f2879efd0c5368e8baf81ba17387da985c23c68.tar.gz
linux-yocto/5.15: arm: poky-tiny cleanup and fixes
Integrating the following commit(s) to linux-yocto/.: 20dcef87913 versatile: restore explicit CONFIG_ARM 8e63ec2fc66 qemuarm64: cleanup for tiny enablement fa720c009a8 arm-versatile-926ejs: reorg for tiny and preempt-rt 7febff689a8 qemuarma15: fix tiny and preempt-rt 7720c50d622 tiny: make more generic f052e84eafa pci: remove CONFIG_PCI_MMCONFIG 917043019b4 virtio: Add prereqs for tiny da919d67b1a common-pc: add CONFIG_ISA_DMA_API for tiny 1a3a497c472 x2apic: enable iommu for tiny 63e25b57177 features/security: Move x86_64 configs to separate file (From OE-Core rev: 3e966df4f2d3236a259e6057f2deb22823fca173) Signed-off-by: Jon Mason <jdmason@kudzu.us> 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_5.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.15.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index 87ccfc1f45..b7949e3b85 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "29d051cc421a76432897019edc33edae35b16e39" 14SRCREV_machine ?= "29d051cc421a76432897019edc33edae35b16e39"
15SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6" 15SRCREV_meta ?= "20dcef879138eeb57347b35d2250a432ee23d927"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index 43a5ad728a..129b70cb24 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -15,7 +15,7 @@ KMETA = "kernel-meta"
15KCONF_BSP_AUDIT_LEVEL = "2" 15KCONF_BSP_AUDIT_LEVEL = "2"
16 16
17SRCREV_machine ?= "c3d54a67cbf3fb8e6df2d88c80e9d2c74f69aba4" 17SRCREV_machine ?= "c3d54a67cbf3fb8e6df2d88c80e9d2c74f69aba4"
18SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6" 18SRCREV_meta ?= "20dcef879138eeb57347b35d2250a432ee23d927"
19 19
20PV = "${LINUX_VERSION}+git${SRCPV}" 20PV = "${LINUX_VERSION}+git${SRCPV}"
21 21
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index 5cfa0c37d7..cfdce6ea97 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "c9f3902d8069e32a8928153a38d8f6115194d128"
23SRCREV_machine:qemux86-64 ?= "c9f3902d8069e32a8928153a38d8f6115194d128" 23SRCREV_machine:qemux86-64 ?= "c9f3902d8069e32a8928153a38d8f6115194d128"
24SRCREV_machine:qemumips64 ?= "a4805fe749c9c56d18a60b5378674760ef0e85ed" 24SRCREV_machine:qemumips64 ?= "a4805fe749c9c56d18a60b5378674760ef0e85ed"
25SRCREV_machine ?= "c9f3902d8069e32a8928153a38d8f6115194d128" 25SRCREV_machine ?= "c9f3902d8069e32a8928153a38d8f6115194d128"
26SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6" 26SRCREV_meta ?= "20dcef879138eeb57347b35d2250a432ee23d927"
27 27
28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
29# get the <version>/base branch, which is pure upstream -stable, and the same 29# get the <version>/base branch, which is pure upstream -stable, and the same