From patchwork Mon Mar 20 03:38:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 21259 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 29746C77B6D for ; Mon, 20 Mar 2023 03:39:29 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.6319.1679283567105372004 for ; Sun, 19 Mar 2023 20:39:27 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (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 7576040C62 for ; Mon, 20 Mar 2023 03:39:26 +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 gCRNNAlHOJqc for ; Mon, 20 Mar 2023 03:39:26 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 6ADFC40301 for ; Mon, 20 Mar 2023 03:39:26 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 58DAD1637C8 for ; Sun, 19 Mar 2023 23:38:54 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master][PATCH 04/53] conf: omap-a15: Fix parsing when KERNEL_DEVICETREE is not set Date: Mon, 20 Mar 2023 03:38:36 +0000 Message-Id: <20230320033925.1306823-5-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320033925.1306823-1-denis@denix.org> References: <20230320033925.1306823-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 ; Mon, 20 Mar 2023 03:39:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16065 From: Zachary Booth Correctly handle parsing when KERNEL_DEVICETREE is not set. Signed-off-by: Zachary Booth Signed-off-by: Joshua Watt Signed-off-by: Joshua Watt Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/include/omap-a15.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index bc6add02..49db1cb6 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -23,7 +23,7 @@ UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" -DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}" +DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}" # Generate an extlinux.conf file UBOOT_EXTLINUX = "1"