diff mbox series

[master,2/6] ti-kernel-devicetree-prefix: use shared kernel sources for prefix match

Message ID 20250630175516.1782298-2-denis@denix.org
State New
Headers show
Series [master,1/6] beagle-bsp: unset KERNEL_DEVICETREE_PREFIX | expand

Commit Message

Denys Dmytriyenko June 30, 2025, 5:55 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Handle devicetree prefix matching inside the shared kernel sources
tree, instead of ${S}. From the kernel recipe perspective, ${S} is
just a symlink to the shared kernel sources. But since the new FIT
image wrapper is a separate recipe now, it has its own different
${S}. To enable FIT image wrapper to support devicetree prefix
matching, it also needs to access the same shared kernel sources.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-kernel/linux/ti-kernel-devicetree-prefix.inc    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc
index 04c91004..2d7be280 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc
@@ -1,4 +1,3 @@ 
-
 def get_dtbs_from_kernel(dts_dir, dts_prefix):
     import os
     import glob
@@ -36,7 +35,6 @@  def get_merge_dtbs_from_kernel(dts_dir, dts_pattern):
 KERNEL_DEVICETREE_DTBMERGE ?= ""
 
 KERNEL_DEVICETREE = " \
-    ${@get_dtbs_from_kernel('${S}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_PREFIX}')} \
-    ${@get_merge_dtbs_from_kernel('${S}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_DTBMERGE}')} \
+    ${@get_dtbs_from_kernel('${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_PREFIX}')} \
+    ${@get_merge_dtbs_from_kernel('${STAGING_KERNEL_DIR}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_DTBMERGE}')} \
 "
-