All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Davis <afd@ti.com>
To: Denys Dmytriyenko <denys@konsulko.com>,
	Ryan Eatmon <reatmon@ti.com>, <meta-ti@lists.yoctoproject.org>
Cc: Andrew Davis <afd@ti.com>
Subject: [meta-ti][dunfell][PATCH 7/8] ti-sci-fw: Only install and deploy combined boot symlink when set
Date: Thu, 4 Aug 2022 21:49:33 -0500	[thread overview]
Message-ID: <20220805024934.23349-7-afd@ti.com> (raw)
In-Reply-To: <20220805024934.23349-1-afd@ti.com>

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 <afd@ti.com>
---
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index b06f6abe..72a3120e 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/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}/
-- 
2.36.1



  parent reply	other threads:[~2022-08-05  2:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-05  2:49 [meta-ti][dunfell][PATCH 1/8] u-boot-ti: Do not prepend output files with DEPLOYDIR Andrew Davis
2022-08-05  2:49 ` [meta-ti][dunfell][PATCH 2/8] optee-os: Allow build to continue without TI_SECURE_DEV_PKG set Andrew Davis
2022-08-05  2:49 ` [meta-ti][dunfell][PATCH 3/8] trusted-firmware-a: " Andrew Davis
2022-08-05  2:49 ` [meta-ti][dunfell][PATCH 4/8] prueth-fw: Deploy for AM64xx based on SoC not EVM Andrew Davis
2022-08-05  2:49 ` [meta-ti][dunfell][PATCH 5/8] machine: k3r5: Make combined R5 boot the default Andrew Davis
2022-08-05  2:49 ` [meta-ti][dunfell][PATCH 6/8] ti-sci-fw: " Andrew Davis
2022-08-05  2:49 ` Andrew Davis [this message]
2022-08-05  2:49 ` [meta-ti][dunfell][PATCH 8/8] conf: machine: Move K3 TI_SECURE_DEV_PKG definition to common include Andrew Davis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220805024934.23349-7-afd@ti.com \
    --to=afd@ti.com \
    --cc=denys@konsulko.com \
    --cc=meta-ti@lists.yoctoproject.org \
    --cc=reatmon@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.