[dunfell][RFC 4/6] ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image


Andrew Davis
 

Currently we reuse UBOOT_* names which usually are the same we
want to give to the name of the SYSFW binary. This isn't always
correct, we should use a SYSFW specific variable in case the
UBOOT names are changed.

Signed-off-by: Andrew Davis <afd@...>
---
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 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 1bb4fd3e..1b2ea184 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,8 @@ 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_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
@@ -78,10 +80,9 @@ do_install() {
fi
fi

- if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then
- install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
- ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK}
- ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
+ 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
fi
}

@@ -100,10 +101,9 @@ do_deploy () {
fi
fi

- if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then
- install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
- ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
- ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
+ if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then
+ install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3}
+ ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/tiboot3.bin
fi

install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
--
2.36.1