[meta-ti][dunfell][PATCH v2] ti-sci-fw_git: Fix issue with using gp*.bin for TISCI firmware

[meta-ti][dunfell][PATCH v2] ti-sci-fw_git: Fix issue with using gp*.bin for TISCI firmware

[Yogesh Siraswar]

With ti-sysfs also hosting *gp-cert.bin for am64x hs-fs breaks gp.
This patch removes * to directly reference the TISCI firmware

Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
---

Change from v1:
Previous version caused issue with the HS platforms.
Added conditional statement for HS device.

 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ca56e1de..a1a7446b 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -27,8 +27,9 @@ SYSFW_PREFIX_j7-hs-evm-k3r5 = "ti-fs-firmware"
 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/${SYSFW_BASE}.bin"
 
 SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
 SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
-- 
2.17.1

Re: [meta-ti][dunfell][PATCH v2] ti-sci-fw_git: Fix issue with using gp*.bin for TISCI firmware

[Denys Dmytriyenko]

On Thu, Oct 21, 2021 at 07:04:41AM +0000, Yogesh Siraswar via lists.yoctoproject.org wrote:
> With ti-sysfs also hosting *gp-cert.bin for am64x hs-fs breaks gp.
> This patch removes * to directly reference the TISCI firmware
> 
> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
> ---
> 
> Change from v1:
> Previous version caused issue with the HS platforms.
> Added conditional statement for HS device.
> 
>  recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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 ca56e1de..a1a7446b 100644
> --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> @@ -27,8 +27,9 @@ SYSFW_PREFIX_j7-hs-evm-k3r5 = "ti-fs-firmware"
>  SYSFW_SUFFIX ?= "unknown"
>  
>  SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}"
> +SYSFW_BASE_append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}"

This kind of makes sense, but I'm afraid it could negatively affect 
SYSFW_HS_PATH and SYSFW_HS_INNER_CERT_PATH having * and passed to the 
Makefile:

EXTRA_OEMAKE_HS = " \
    HS=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \
"


> -SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}*.bin"
> +SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin"
>  
>  SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
>  SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
> -- 
> 2.17.1
> 

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

Re: [meta-ti][dunfell][PATCH v2] ti-sci-fw_git: Fix issue with using gp*.bin for TISCI firmware

[Yogesh Siraswar]

On 10/21/2021 3:52 PM, Denys Dmytriyenko wrote:
> On Thu, Oct 21, 2021 at 07:04:41AM +0000, Yogesh Siraswar via lists.yoctoproject.org wrote:
>> With ti-sysfs also hosting *gp-cert.bin for am64x hs-fs breaks gp.
>> This patch removes * to directly reference the TISCI firmware
>>
>> Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
>> ---
>>
>> Change from v1:
>> Previous version caused issue with the HS platforms.
>> Added conditional statement for HS device.
>>
>>   recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> 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 ca56e1de..a1a7446b 100644
>> --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
>> +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
>> @@ -27,8 +27,9 @@ SYSFW_PREFIX_j7-hs-evm-k3r5 = "ti-fs-firmware"
>>   SYSFW_SUFFIX ?= "unknown"
>>   
>>   SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}"
>> +SYSFW_BASE_append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}"
> 
> This kind of makes sense, but I'm afraid it could negatively affect
> SYSFW_HS_PATH and SYSFW_HS_INNER_CERT_PATH having * and passed to the
> Makefile:
> 
> EXTRA_OEMAKE_HS = " \
>      HS=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \
> "

This is similar to what we had for GP device :). Yes, its not idle but 
need more time to think this through. So will merge this for now since 
the builds are passing for both GP and HS..

> 
> 
>> -SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}*.bin"
>> +SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin"
>>   
>>   SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
>>   SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
>> -- 
>> 2.17.1
>>
>