| Message ID | 20231012172947.1359231-2-a-limaye@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | Fix build for tispl.bin | expand |
On 10/12/23 12:29 PM, Aniket Limaye via lists.yoctoproject.org wrote: > Revert ebcf15bf0f31208e87ce60a4696e585940b46777 : > "recipes-bsp:ti-sci-fw: Add k3r5 as COMPATIBLE_MACHINE" > > Extend recipe to k3 machines too, to provide ti-fs-stub-* firmware > for u-boot aarch64 build. > > Update do_deploy() to allow multiconfig builds for k3 machines > > Signed-off-by: Aniket Limaye <a-limaye@ti.com> > --- > meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 ++++-- > 1 file changed, 4 insertions(+), 2 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 801c8768..2ad93a5d 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 > @@ -4,7 +4,6 @@ inherit deploy > > require recipes-bsp/ti-linux-fw/ti-linux-fw.inc > > -COMPATIBLE_MACHINE = "k3r5" > PACKAGE_ARCH = "${MACHINE_ARCH}" > > CFLAGS[unexport] = "1" > @@ -26,7 +25,10 @@ do_install() { > > FILES:${PN} = "${nonarch_base_libdir}/firmware" > > -do_deploy() { > +do_deploy(){ > +} > + > +do_deploy:k3r5() { > install -d ${DEPLOYDIR}/ti-sysfw > install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw > install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw Why do we need to deploy these files in ${DEPLOYDIR}/ at all? Andrew > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#17097): https://lists.yoctoproject.org/g/meta-ti/message/17097 > Mute This Topic: https://lists.yoctoproject.org/mt/101923272/3619733 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [afd@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Hi Andrew, We need those files to be packaged in the tisdk-core-bundle... So that it can be packaged in the installer we release on ti.com. We package these, ti-dm and the u-boot sources used, to enable u-boot builds in the installer with the same sources used for our build. Regards, Aniket -----Original Message----- From: Davis, Andrew <afd@ti.com> Sent: Friday, October 13, 2023 2:37 AM To: Limaye, Aniket <a-limaye@ti.com>; meta-ti@lists.yoctoproject.org Cc: Eatmon, Ryan <reatmon@ti.com>; Gole, Dhruva <d-gole@ti.com>; Shilwant, Chirag <c-shilwant@ti.com>; Adivi, Sai Sree Kartheek <s-adivi@ti.com>; Raghavendra, Vignesh <vigneshr@ti.com> Subject: Re: [meta-ti][master/kirkstone][PATCH 1/2] ti-sci-fw: Remove COMPATIBLE_MACHINE and extend recipe to k3 machines On 10/12/23 12:29 PM, Aniket Limaye via lists.yoctoproject.org wrote: > Revert ebcf15bf0f31208e87ce60a4696e585940b46777 : > "recipes-bsp:ti-sci-fw: Add k3r5 as COMPATIBLE_MACHINE" > > Extend recipe to k3 machines too, to provide ti-fs-stub-* firmware for > u-boot aarch64 build. > > Update do_deploy() to allow multiconfig builds for k3 machines > > Signed-off-by: Aniket Limaye <a-limaye@ti.com> > --- > meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 ++++-- > 1 file changed, 4 insertions(+), 2 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 801c8768..2ad93a5d 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 > @@ -4,7 +4,6 @@ inherit deploy > > require recipes-bsp/ti-linux-fw/ti-linux-fw.inc > > -COMPATIBLE_MACHINE = "k3r5" > PACKAGE_ARCH = "${MACHINE_ARCH}" > > CFLAGS[unexport] = "1" > @@ -26,7 +25,10 @@ do_install() { > > FILES:${PN} = "${nonarch_base_libdir}/firmware" > > -do_deploy() { > +do_deploy(){ > +} > + > +do_deploy:k3r5() { > install -d ${DEPLOYDIR}/ti-sysfw > install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw > install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw Why do we need to deploy these files in ${DEPLOYDIR}/ at all? Andrew > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#17097): > https://lists.yoctoproject.org/g/meta-ti/message/17097 > Mute This Topic: https://lists.yoctoproject.org/mt/101923272/3619733 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub > [afd@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 10/12/23 10:38 PM, Limaye, Aniket wrote: > Hi Andrew, > > We need those files to be packaged in the tisdk-core-bundle... So that it can be packaged in the installer we release on ti.com. We package these, ti-dm and the u-boot sources used, to enable u-boot builds in the installer with the same sources used for our build. > You can fetch those firmware out of their normal install directory. Andrew > Regards, > Aniket > > -----Original Message----- > From: Davis, Andrew <afd@ti.com> > Sent: Friday, October 13, 2023 2:37 AM > To: Limaye, Aniket <a-limaye@ti.com>; meta-ti@lists.yoctoproject.org > Cc: Eatmon, Ryan <reatmon@ti.com>; Gole, Dhruva <d-gole@ti.com>; Shilwant, Chirag <c-shilwant@ti.com>; Adivi, Sai Sree Kartheek <s-adivi@ti.com>; Raghavendra, Vignesh <vigneshr@ti.com> > Subject: Re: [meta-ti][master/kirkstone][PATCH 1/2] ti-sci-fw: Remove COMPATIBLE_MACHINE and extend recipe to k3 machines > > On 10/12/23 12:29 PM, Aniket Limaye via lists.yoctoproject.org wrote: >> Revert ebcf15bf0f31208e87ce60a4696e585940b46777 : >> "recipes-bsp:ti-sci-fw: Add k3r5 as COMPATIBLE_MACHINE" >> >> Extend recipe to k3 machines too, to provide ti-fs-stub-* firmware for >> u-boot aarch64 build. >> >> Update do_deploy() to allow multiconfig builds for k3 machines >> >> Signed-off-by: Aniket Limaye <a-limaye@ti.com> >> --- >> meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 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 801c8768..2ad93a5d 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 >> @@ -4,7 +4,6 @@ inherit deploy >> >> require recipes-bsp/ti-linux-fw/ti-linux-fw.inc >> >> -COMPATIBLE_MACHINE = "k3r5" >> PACKAGE_ARCH = "${MACHINE_ARCH}" >> >> CFLAGS[unexport] = "1" >> @@ -26,7 +25,10 @@ do_install() { >> >> FILES:${PN} = "${nonarch_base_libdir}/firmware" >> >> -do_deploy() { >> +do_deploy(){ >> +} >> + >> +do_deploy:k3r5() { >> install -d ${DEPLOYDIR}/ti-sysfw >> install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw >> install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw > > Why do we need to deploy these files in ${DEPLOYDIR}/ at all? > > Andrew > >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#17097): >> https://lists.yoctoproject.org/g/meta-ti/message/17097 >> Mute This Topic: https://lists.yoctoproject.org/mt/101923272/3619733 >> Group Owner: meta-ti+owner@lists.yoctoproject.org >> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub >> [afd@ti.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
On 13/10/23 20:34, Andrew Davis wrote: > On 10/12/23 10:38 PM, Limaye, Aniket wrote: >> Hi Andrew, >> >> We need those files to be packaged in the tisdk-core-bundle... So >> that it can be packaged in the installer we release on ti.com. We >> package these, ti-dm and the u-boot sources used, to enable u-boot >> builds in the installer with the same sources used for our build. >> > > You can fetch those firmware out of their normal install directory. > > Andrew > >> Regards, >> Aniket >> >> -----Original Message----- >> From: Davis, Andrew <afd@ti.com> >> Sent: Friday, October 13, 2023 2:37 AM >> To: Limaye, Aniket <a-limaye@ti.com>; meta-ti@lists.yoctoproject.org >> Cc: Eatmon, Ryan <reatmon@ti.com>; Gole, Dhruva <d-gole@ti.com>; >> Shilwant, Chirag <c-shilwant@ti.com>; Adivi, Sai Sree Kartheek >> <s-adivi@ti.com>; Raghavendra, Vignesh <vigneshr@ti.com> >> Subject: Re: [meta-ti][master/kirkstone][PATCH 1/2] ti-sci-fw: Remove >> COMPATIBLE_MACHINE and extend recipe to k3 machines >> >> On 10/12/23 12:29 PM, Aniket Limaye via lists.yoctoproject.org wrote: >>> Revert ebcf15bf0f31208e87ce60a4696e585940b46777 : >>> "recipes-bsp:ti-sci-fw: Add k3r5 as COMPATIBLE_MACHINE" >>> >>> Extend recipe to k3 machines too, to provide ti-fs-stub-* firmware for >>> u-boot aarch64 build. >>> >>> Update do_deploy() to allow multiconfig builds for k3 machines >>> >>> Signed-off-by: Aniket Limaye <a-limaye@ti.com> >>> --- >>> meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 ++++-- >>> 1 file changed, 4 insertions(+), 2 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 801c8768..2ad93a5d 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 >>> @@ -4,7 +4,6 @@ inherit deploy >>> require recipes-bsp/ti-linux-fw/ti-linux-fw.inc >>> -COMPATIBLE_MACHINE = "k3r5" >>> PACKAGE_ARCH = "${MACHINE_ARCH}" >>> CFLAGS[unexport] = "1" >>> @@ -26,7 +25,10 @@ do_install() { >>> FILES:${PN} = "${nonarch_base_libdir}/firmware" >>> -do_deploy() { >>> +do_deploy(){ >>> +} >>> + >>> +do_deploy:k3r5() { >>> install -d ${DEPLOYDIR}/ti-sysfw >>> install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* >>> ${DEPLOYDIR}/ti-sysfw >>> install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* >>> ${DEPLOYDIR}/ti-sysfw >> >> Why do we need to deploy these files in ${DEPLOYDIR}/ at all? >> >> Andrew >> >> This will deploy all ti-sci-* & ti-fs-* firmwares present in ti-linux-firmware repository in the deploy directory irrespective of the yocto machine which is redundant. It's better if we deploy based on yocto machine. >>> >>> >>> -=-=-=-=-=-=-=-=-=-=-=- >>> Links: You receive all messages sent to this group. >>> View/Reply Online (#17097): >>> https://lists.yoctoproject.org/g/meta-ti/message/17097 >>> Mute This Topic: https://lists.yoctoproject.org/mt/101923272/3619733 >>> Group Owner: meta-ti+owner@lists.yoctoproject.org >>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub >>> [afd@ti.com] >>> -=-=-=-=-=-=-=-=-=-=-=- >>>
On 13/10/23 20:34, Andrew Davis wrote: > On 10/12/23 10:38 PM, Limaye, Aniket wrote: >> Hi Andrew, >> >> We need those files to be packaged in the tisdk-core-bundle... So >> that it can be packaged in the installer we release on ti.com. We >> package these, ti-dm and the u-boot sources used, to enable u-boot >> builds in the installer with the same sources used for our build. >> > > You can fetch those firmware out of their normal install directory. > > Andrew > Hi Andrew, I am not sure what you meant by the normal install directory. If you meant the "image" directory, the tisdk-core-bundle recipe cannot access the image directory of another recipe... I don't see a straightforward way of having the core-bundle recipe pick up these images from the ti-sci-fw recipe. Secondly, the tisdk-core-bundle always was and still is picking boot images, among other things, from the deploy directory [1]. ti-sci-fw itself was deploying these images in meta-ti up until 8.6 release and up until this commit in kirkstone [2], not sure what the reasoning was to remove it there either... we did need the deployed binaries in the core-bundle and handled it through a bbappend in both Proc SDK layers in 9.0. Lastly, ti-dm-fw also was always deploying the firmware [3]. Unless that was done for some special usecase that I am not aware of, I think that one was also needed for the same reason... to put it in the tisdk-core-bundle? [1]: https://git.ti.com/cgit/arago-project/meta-arago/tree/meta-arago-distro/classes/tisdk-bundle.bbclass?h=kirkstone#n272 [2]: https://git.ti.com/cgit/arago-project/meta-ti/commit/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb?h=kirkstone&id=7b797da2ef43f4f450a546816b43b28f9379305a [3]: https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb?h=kirkstone#n68 Aniket >> Regards, >> Aniket >> >> -----Original Message----- >> From: Davis, Andrew <afd@ti.com> >> Sent: Friday, October 13, 2023 2:37 AM >> To: Limaye, Aniket <a-limaye@ti.com>; meta-ti@lists.yoctoproject.org >> Cc: Eatmon, Ryan <reatmon@ti.com>; Gole, Dhruva <d-gole@ti.com>; >> Shilwant, Chirag <c-shilwant@ti.com>; Adivi, Sai Sree Kartheek >> <s-adivi@ti.com>; Raghavendra, Vignesh <vigneshr@ti.com> >> Subject: Re: [meta-ti][master/kirkstone][PATCH 1/2] ti-sci-fw: Remove >> COMPATIBLE_MACHINE and extend recipe to k3 machines >> >> On 10/12/23 12:29 PM, Aniket Limaye via lists.yoctoproject.org wrote: >>> Revert ebcf15bf0f31208e87ce60a4696e585940b46777 : >>> "recipes-bsp:ti-sci-fw: Add k3r5 as COMPATIBLE_MACHINE" >>> >>> Extend recipe to k3 machines too, to provide ti-fs-stub-* firmware for >>> u-boot aarch64 build. >>> >>> Update do_deploy() to allow multiconfig builds for k3 machines >>> >>> Signed-off-by: Aniket Limaye <a-limaye@ti.com> >>> --- >>> meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 ++++-- >>> 1 file changed, 4 insertions(+), 2 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 801c8768..2ad93a5d 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 >>> @@ -4,7 +4,6 @@ inherit deploy >>> require recipes-bsp/ti-linux-fw/ti-linux-fw.inc >>> -COMPATIBLE_MACHINE = "k3r5" >>> PACKAGE_ARCH = "${MACHINE_ARCH}" >>> CFLAGS[unexport] = "1" >>> @@ -26,7 +25,10 @@ do_install() { >>> FILES:${PN} = "${nonarch_base_libdir}/firmware" >>> -do_deploy() { >>> +do_deploy(){ >>> +} >>> + >>> +do_deploy:k3r5() { >>> install -d ${DEPLOYDIR}/ti-sysfw >>> install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* >>> ${DEPLOYDIR}/ti-sysfw >>> install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* >>> ${DEPLOYDIR}/ti-sysfw >> >> Why do we need to deploy these files in ${DEPLOYDIR}/ at all? >> >> Andrew >> >>> >>> >>> >>> -=-=-=-=-=-=-=-=-=-=-=- >>> Links: You receive all messages sent to this group. >>> View/Reply Online (#17097): >>> https://lists.yoctoproject.org/g/meta-ti/message/17097 >>> Mute This Topic: https://lists.yoctoproject.org/mt/101923272/3619733 >>> Group Owner: meta-ti+owner@lists.yoctoproject.org >>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub >>> [afd@ti.com] >>> -=-=-=-=-=-=-=-=-=-=-=- >>>
On 10/16/23 6:19 AM, Aniket Limaye wrote: > > On 13/10/23 20:34, Andrew Davis wrote: >> On 10/12/23 10:38 PM, Limaye, Aniket wrote: >>> Hi Andrew, >>> >>> We need those files to be packaged in the tisdk-core-bundle... So that it can be packaged in the installer we release on ti.com. We package these, ti-dm and the u-boot sources used, to enable u-boot builds in the installer with the same sources used for our build. >>> >> >> You can fetch those firmware out of their normal install directory. >> >> Andrew >> > Hi Andrew, > > I am not sure what you meant by the normal install directory. If you meant the "image" directory, the tisdk-core-bundle recipe cannot access the image directory of another recipe... I don't see a straightforward way of having the core-bundle recipe pick up these images from the ti-sci-fw recipe. > Are you sure..? We do it all the time, that is the core function of the DEPENDS variable. If you DEPEND on a recipe, then you have access to the installed output of it. If you make core-bundle recipe DEPEND on ti-sci-fw you will find the firmware in `${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-sysfw*` for use in the recipe build steps. > Secondly, the tisdk-core-bundle always was and still is picking boot images, among other things, from the deploy directory [1]. > Correct, but doesn't mean it isn't a hack. My suggestion is to fix tisdk-core-bundle. DEPLOYDIR is for output to the user, "to be used outside of the build system" according to the OE docs. It should not be a staging directory for intermediate file sharing between recipes. Same comment for the below points, just because we did before, doesn't mean we should continue. Andrew > ti-sci-fw itself was deploying these images in meta-ti up until 8.6 release and up until this commit in kirkstone [2], not sure what the reasoning was to remove it there either... we did need the deployed binaries in the core-bundle and handled it through a bbappend in both Proc SDK layers in 9.0. > > Lastly, ti-dm-fw also was always deploying the firmware [3]. Unless that was done for some special usecase that I am not aware of, I think that one was also needed for the same reason... to put it in the tisdk-core-bundle? > > [1]: https://git.ti.com/cgit/arago-project/meta-arago/tree/meta-arago-distro/classes/tisdk-bundle.bbclass?h=kirkstone#n272 > [2]: https://git.ti.com/cgit/arago-project/meta-ti/commit/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb?h=kirkstone&id=7b797da2ef43f4f450a546816b43b28f9379305a > [3]: https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb?h=kirkstone#n68 > > > Aniket > >>> Regards, >>> Aniket >>> >>> -----Original Message----- >>> From: Davis, Andrew <afd@ti.com> >>> Sent: Friday, October 13, 2023 2:37 AM >>> To: Limaye, Aniket <a-limaye@ti.com>; meta-ti@lists.yoctoproject.org >>> Cc: Eatmon, Ryan <reatmon@ti.com>; Gole, Dhruva <d-gole@ti.com>; Shilwant, Chirag <c-shilwant@ti.com>; Adivi, Sai Sree Kartheek <s-adivi@ti.com>; Raghavendra, Vignesh <vigneshr@ti.com> >>> Subject: Re: [meta-ti][master/kirkstone][PATCH 1/2] ti-sci-fw: Remove COMPATIBLE_MACHINE and extend recipe to k3 machines >>> >>> On 10/12/23 12:29 PM, Aniket Limaye via lists.yoctoproject.org wrote: >>>> Revert ebcf15bf0f31208e87ce60a4696e585940b46777 : >>>> "recipes-bsp:ti-sci-fw: Add k3r5 as COMPATIBLE_MACHINE" >>>> >>>> Extend recipe to k3 machines too, to provide ti-fs-stub-* firmware for >>>> u-boot aarch64 build. >>>> >>>> Update do_deploy() to allow multiconfig builds for k3 machines >>>> >>>> Signed-off-by: Aniket Limaye <a-limaye@ti.com> >>>> --- >>>> meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 ++++-- >>>> 1 file changed, 4 insertions(+), 2 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 801c8768..2ad93a5d 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 >>>> @@ -4,7 +4,6 @@ inherit deploy >>>> require recipes-bsp/ti-linux-fw/ti-linux-fw.inc >>>> -COMPATIBLE_MACHINE = "k3r5" >>>> PACKAGE_ARCH = "${MACHINE_ARCH}" >>>> CFLAGS[unexport] = "1" >>>> @@ -26,7 +25,10 @@ do_install() { >>>> FILES:${PN} = "${nonarch_base_libdir}/firmware" >>>> -do_deploy() { >>>> +do_deploy(){ >>>> +} >>>> + >>>> +do_deploy:k3r5() { >>>> install -d ${DEPLOYDIR}/ti-sysfw >>>> install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw >>>> install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw >>> >>> Why do we need to deploy these files in ${DEPLOYDIR}/ at all? >>> >>> Andrew >>> >>>> >>>> >>>> >>>> -=-=-=-=-=-=-=-=-=-=-=- >>>> Links: You receive all messages sent to this group. >>>> View/Reply Online (#17097): >>>> https://lists.yoctoproject.org/g/meta-ti/message/17097 >>>> Mute This Topic: https://lists.yoctoproject.org/mt/101923272/3619733 >>>> Group Owner: meta-ti+owner@lists.yoctoproject.org >>>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub >>>> [afd@ti.com] >>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>
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 801c8768..2ad93a5d 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 @@ -4,7 +4,6 @@ inherit deploy require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -COMPATIBLE_MACHINE = "k3r5" PACKAGE_ARCH = "${MACHINE_ARCH}" CFLAGS[unexport] = "1" @@ -26,7 +25,10 @@ do_install() { FILES:${PN} = "${nonarch_base_libdir}/firmware" -do_deploy() { +do_deploy(){ +} + +do_deploy:k3r5() { install -d ${DEPLOYDIR}/ti-sysfw install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw
Revert ebcf15bf0f31208e87ce60a4696e585940b46777 : "recipes-bsp:ti-sci-fw: Add k3r5 as COMPATIBLE_MACHINE" Extend recipe to k3 machines too, to provide ti-fs-stub-* firmware for u-boot aarch64 build. Update do_deploy() to allow multiconfig builds for k3 machines Signed-off-by: Aniket Limaye <a-limaye@ti.com> --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)