From patchwork Fri Nov 4 22:46:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14891 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 CD0F5C43217 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.823.1667602017137303041 for ; Fri, 04 Nov 2022 15:46:57 -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 8A92740D8A for ; Fri, 4 Nov 2022 22:46:56 +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 j_HEself6fEf for ; Fri, 4 Nov 2022 22:46:56 +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 7575840D82 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 0DC8716367F for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 06/50] ti-sci-fw: Only install and deploy combined boot symlink when set Date: Fri, 4 Nov 2022 22:46:08 +0000 Message-Id: <20221104224653.1223044-7-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-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, 04 Nov 2022 22:46:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15277 From: Andrew Davis Add SYSFW_TIBOOT3_SYMLINK and use it the same way we use SYSFW_SYMLINK for the non-combined boot flow, to allow not setting the default for some machine types. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 3daf0c68..506052ca 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -37,6 +37,7 @@ SYSFW_PREFIX:am62xx-evm-k3r5 = "fs" SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin" +SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin" SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" @@ -80,7 +81,9 @@ do_install() { if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3} - ln -sf ${SYSFW_TIBOOT3} ${D}/boot/tiboot3.bin + if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then + ln -sf ${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3_SYMLINK} + fi fi } @@ -101,7 +104,9 @@ do_deploy () { if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3} - ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/tiboot3.bin + if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then + ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3_SYMLINK} + fi fi install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/