diff mbox series

[scarthgap,2/3] meta-ti-bsp: generalize non-vendored DEVICETREE_FILES

Message ID 20250725204908.2549495-2-denis@denix.org
State Under Review
Delegated to: Ryan Eatmon
Headers show
Series [scarthgap,1/3] meta-ti-bsp: move KERNEL_DTBVENDORED settings | expand

Commit Message

Denys Dmytriyenko July 25, 2025, 8:49 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Automatically generate non-vendored DTBs list in DEVICETREE_FILES from
vendored KERNEL_DEVICETREE list for all platforms to use.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/include/omap-a15.inc | 4 +---
 meta-ti-bsp/conf/machine/include/ti-soc.inc   | 3 +++
 meta-ti-bsp/conf/machine/include/ti33x.inc    | 4 +---
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 4 +---
 4 files changed, 6 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index a258decd..3b8eb0fd 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -19,15 +19,13 @@  UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","").replace("ti/","")}"
-
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
 UBOOT_EXTLINUX_BOOT_FILES = " \
     extlinux.conf;extlinux/extlinux.conf \
     ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILE} \
+    ${DEVICETREE_FILES} \
 "
 
 SPL_BINARY = "MLO"
diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc
index 27bb38b5..85f6f338 100644
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -16,3 +16,6 @@  MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
 # the kernel
 KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
 KERNEL_DTBVENDORED = "1"
+
+# Also build a non-vendored list w/o dir structure
+DEVICETREE_FILES = "${@' '.join([os.path.basename(f) for f in d.getVar("KERNEL_DEVICETREE").split()])}"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index 7e9eb48c..c47165e4 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -64,8 +64,6 @@  UBOOT_MACHINE = "am335x_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
-
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
@@ -73,7 +71,7 @@  UBOOT_EXTLINUX_KERNEL_ARGS = "rootwait rw earlycon"
 UBOOT_EXTLINUX_BOOT_FILES = " \
     extlinux.conf;extlinux/extlinux.conf \
     ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILE} \
+    ${DEVICETREE_FILES} \
 "
 
 SPL_BINARY = "MLO"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 2621d19a..a23b6518 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -37,15 +37,13 @@  UBOOT_MACHINE = "am43xx_evm_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}"
-
 # Generate an extlinux.conf file
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
 UBOOT_EXTLINUX_BOOT_FILES = " \
     extlinux.conf;extlinux/extlinux.conf \
     ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILE} \
+    ${DEVICETREE_FILES} \
 "
 
 SPL_BINARY = "MLO"