From 485a6955c52e98139a9e7cb2fcd965385153f060 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 4 Nov 2022 22:46:05 +0000 Subject: [PATCH] ti-sci-fw: Deploy all SYSFW firmware types This allows us to rebuild and re-sign the SYSFW image if needed from the deploy directory for any SoC type. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 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 64c71292..61afeaeb 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 @@ -22,24 +22,20 @@ TI_SECURE_DEV_PKG ?= "" export TI_SECURE_DEV_PKG SYSFW_SOC ?= "unknown" +SYSFW_SUFFIX ?= "unknown" SYSFW_CONFIG ?= "unknown" -SYSFW_PREFIX = "ti-sci-firmware" -SYSFW_PREFIX:j721e-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721e-hs-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" -SYSFW_PREFIX:j7200-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j7200-hs-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721s2-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:am62xx-evm-k3r5 = "ti-fs-firmware" +SYSFW_PREFIX = "sci" +SYSFW_PREFIX:j721e-evm-k3r5 = "fs" +SYSFW_PREFIX:j721e-hs-evm-k3r5 = "fs" +SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "fs" +SYSFW_PREFIX:j7200-evm-k3r5 = "fs" +SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs" +SYSFW_PREFIX:j721s2-evm-k3r5 = "fs" +SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs" +SYSFW_PREFIX:am62xx-evm-k3r5 = "fs" -SYSFW_SUFFIX ?= "unknown" - -SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}" -SYSFW_BASE:append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}" - -SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin" +SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"