Skip to contentSkip to conversation

beagle-bsp: unset KERNEL_DEVICETREE_PREFIX

PATCH New Ryan Eatmon 1 participant 2 messages Jul 23, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 beagle-bsp: unset KERNEL_DEVICETREE_PREFIX

From: Denys Dmytriyenko <[email protected]>

Beagle machines define both static KERNEL_DEVICETREE list and dynamic KERNEL_DEVICETREE_PREFIX matching. But BB.org kernel recipes only use the static list, while TI kernel recipes use dynamic prefix matching by default.

Since devicetree lists now need to be used outside of the kernel build, specifically for the new FIT processing wrapper, explicitly unset KERNEL_DEVICETREE_PREFIX to disable dynamic devicetree prefix matching, when BB.org BSPs are selected.

This way both kernel build and FIT image wrapper will have the same list of DTBs to handle, based on the BSP selection.

---
v1: Backport from master patch.

 meta-beagle/conf/machine/include/beagle-bsp.inc | 2 ++
 1 file changed, 2 insertions(+)
meta-beagle/conf/machine/include/beagle-bsp.inc +2 -0
index 3f9828f3..d180c297 100644
@@ -14,6 +14,7 @@ BSP_KERNEL_PROVIDER:bsp-bb_org-6_12 = "linux-bb.org"
 BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%"
 BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org"
 BSP_BOOTLOADER_VERSION:bsp-bb_org-6_12 = "2025.%"
+KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""
 
 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
@@ -36,6 +37,7 @@ BSP_KERNEL_PROVIDER:bsp-bb_org-6_6 = "linux-bb.org"
 BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%"
 BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org"
 BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%"
+KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""
 
 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 ti-kernel-devicetree-prefix: use shared kernel sources for prefix match

From: Denys Dmytriyenko <[email protected]>

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.

---
v1: Backport from master patch.

 .../recipes-kernel/linux/ti-kernel-devicetree-prefix.inc    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc +2 -4
index 04c91004..2d7be280 100644
@@ -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}')} \
 "
-
Signature · 1 line
2.17.1