From patchwork Fri Jul 25 20:48:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 67494 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36E95C87FCA for ; Fri, 25 Jul 2025 20:48:48 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.29129.1753476520082471816 for ; Fri, 25 Jul 2025 13:48:40 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id C9FA240BA9; Fri, 25 Jul 2025 20:48:38 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x6R68gvnv47T; Fri, 25 Jul 2025 20:48:38 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id AEFDE40CC0; Fri, 25 Jul 2025 20:48:37 +0000 (UTC) Received: from thorin.han-sole.ts.net (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id CC7BE16CE2D; Fri, 25 Jul 2025 16:48:36 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 2/3] meta-ti-bsp: generalize non-vendored DEVICETREE_FILES Date: Fri, 25 Jul 2025 16:48:35 -0400 Message-Id: <20250725204836.2549216-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250725204836.2549216-1-denis@denix.org> References: <20250725204836.2549216-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 25 Jul 2025 20:48:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18831 From: Denys Dmytriyenko Automatically generate non-vendored DTBs list in DEVICETREE_FILES from vendored KERNEL_DEVICETREE list for all platforms to use. Signed-off-by: Denys Dmytriyenko --- 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 --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 2eefa8a0..e605d14b 100644 --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc @@ -19,3 +19,6 @@ KERNEL_BASE_CLASS = "kernel" # 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"