summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2023-10-12 10:51:59 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-10-14 22:45:42 +0100
commit9f0177d18f6d831fcc27fca3aae9d65db28649e8 (patch)
tree6e8f299fdc367747dfeccee1e25206932bc77794 /meta
parent29f2ecdd6c2c168f7c17a2035b7927d9171c4bb8 (diff)
downloadpoky-9f0177d18f6d831fcc27fca3aae9d65db28649e8.tar.gz
linux-yocto: Update dtb path for qemuarmv5
In Linux kernel versions 6.5 and later, device tree files have been moved under a vendor directory. The qemuarmv5 one is now located in "arm". Add this to get it working again (which was already done for the dev kernel in commit 42d5e8ef12934db65c35c1c5f0cabb5c21dbea43). Once all kernels <v6.5 are removed, this line should probably be relocated to the qemuarmv5 config file. (From OE-Core rev: c84634d62ca8babf23564c8c7e37856d025e5201) Signed-off-by: Jon Mason <jdmason@kudzu.us> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.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.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.5.bb2
3 files changed, 3 insertions, 3 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 a52115e9d0..f141709c69 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb
@@ -36,7 +36,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
36 36
37COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)$" 37COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)$"
38 38
39KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" 39KERNEL_DEVICETREE:qemuarmv5 = "arm/versatile-pb.dtb"
40 40
41# Functionality flags 41# Functionality flags
42KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" 42KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
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 c41e9211a1..0cae4b9b06 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb
@@ -30,4 +30,4 @@ COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$"
30# Functionality flags 30# Functionality flags
31KERNEL_FEATURES = "" 31KERNEL_FEATURES = ""
32 32
33KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" 33KERNEL_DEVICETREE:qemuarmv5 = "arm/versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb b/meta/recipes-kernel/linux/linux-yocto_6.5.bb
index 0203965a5f..392e6b3d81 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb
@@ -51,7 +51,7 @@ PV = "${LINUX_VERSION}+git"
51KMETA = "kernel-meta" 51KMETA = "kernel-meta"
52KCONF_BSP_AUDIT_LEVEL = "1" 52KCONF_BSP_AUDIT_LEVEL = "1"
53 53
54KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" 54KERNEL_DEVICETREE:qemuarmv5 = "arm/versatile-pb.dtb"
55 55
56COMPATIBLE_MACHINE = "^(qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32|qemuloongarch64)$" 56COMPATIBLE_MACHINE = "^(qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32|qemuloongarch64)$"
57 57