[meta-ti][meta-ti PATCH] ti-sci-fw: Install sysfw.itb in the deploy directory

[meta-ti][meta-ti PATCH] ti-sci-fw: Install sysfw.itb in the deploy directory

[a-m1]

The sysfw.itb to be packaged by the installer is copied to the
prebuilt-images directory from the deploy directory. This
change installs the sysfw.itb in the deploy directory.

Signed-off-by: Aparna M <a-m1@ti.com>
---
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 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 87fdec68..fef87705 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -92,12 +92,11 @@ do_install_j7200-evm-k3r5() {
 	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
 }
 
-do_deploy_j7200-evm-k3r5() {
+do_deploy_append_j7200-evm-k3r5() {
 	install -d ${DEPLOYDIR}
 	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
 	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
 	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
-	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
 }
 
 do_install_am64xx-evm-k3r5() {
@@ -107,12 +106,11 @@ do_install_am64xx-evm-k3r5() {
 	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
 }
 
-do_deploy_am64xx-evm-k3r5() {
+do_deploy_append_am64xx-evm-k3r5() {
 	install -d ${DEPLOYDIR}
 	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
 	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
 	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
-	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
 }
 
 addtask deploy before do_build after do_compile
-- 
2.17.1

Re: [meta-ti][meta-ti PATCH] ti-sci-fw: Install sysfw.itb in the deploy directory

[Denys Dmytriyenko]

On Wed, Jun 02, 2021 at 11:31:51PM +0530, Aparna M via lists.yoctoproject.org wrote:
> The sysfw.itb to be packaged by the installer is copied to the
> prebuilt-images directory from the deploy directory. This
> change installs the sysfw.itb in the deploy directory.
> 
> Signed-off-by: Aparna M <a-m1@ti.com>
> ---
>  recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 ++----
>  1 file changed, 2 insertions(+), 4 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 87fdec68..fef87705 100644
> --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
> @@ -92,12 +92,11 @@ do_install_j7200-evm-k3r5() {
>  	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
>  }
>  
> -do_deploy_j7200-evm-k3r5() {
> +do_deploy_append_j7200-evm-k3r5() {

NAK!
j7200 and am64 package sysfw very differently from other k3 platforms. You 
cannot just append j7200/am64 deployment logic on top of existing one for 
j721e and am65 - they use different sets of variables, etc...


>  	install -d ${DEPLOYDIR}
>  	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
>  	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
>  	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
> -	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
>  }
>  
>  do_install_am64xx-evm-k3r5() {
> @@ -107,12 +106,11 @@ do_install_am64xx-evm-k3r5() {
>  	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
>  }
>  
> -do_deploy_am64xx-evm-k3r5() {
> +do_deploy_append_am64xx-evm-k3r5() {
>  	install -d ${DEPLOYDIR}
>  	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
>  	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
>  	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
> -	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
>  }
>  
>  addtask deploy before do_build after do_compile
> -- 
> 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