Message ID | 20250425204857.3271868-1-c-shilwant@ti.com |
---|---|
State | New |
Headers | show |
Series | [meta-ti,master/scarthgap] recipes-bsp: u-boot: Fix PACKAGECONFIG[dm] arguments | expand |
On 4/25/25 3:48 PM, Chirag Shilwant wrote: > * As observed in the u-boot makefile [0][1], the argument > anticipated by u-boot binman is "TI_DM" instead of "DM". > Hence, fix the same in meta-ti-bsp. > > * The behavior went unnoticed until now because "ti-dm" > was still being sourced from BINMAN_INDIRS, which referred > to "ti-linux-firmware" and the PACKAGECONFIG[dm] feature > was redundant. > > [0]: https://github.com/u-boot/u-boot/blob/v2025.01/Makefile#L1408 > > [1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/Makefile?h=ti-u-boot-2025.01#n1409 > > Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> > --- Acked-by: Andrew Davis <afd@ti.com> > meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc > index 9a74b840..e337f84f 100644 > --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc > +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc > @@ -63,7 +63,7 @@ PLAT_SFX:am62pxx = "am62pxx" > PACKAGECONFIG[ap-trusted-rom] = "BL1=${STAGING_DIR_HOST}/firmware/bl1.bin,,trusted-firmware-a" > PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" > PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os" > -PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw" > +PACKAGECONFIG[dm] = "TI_DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw" > > PACKAGECONFIG:append:aarch64 = " atf optee" > PACKAGECONFIG:append:j721e = " dm"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 9a74b840..e337f84f 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -63,7 +63,7 @@ PLAT_SFX:am62pxx = "am62pxx" PACKAGECONFIG[ap-trusted-rom] = "BL1=${STAGING_DIR_HOST}/firmware/bl1.bin,,trusted-firmware-a" PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os" -PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw" +PACKAGECONFIG[dm] = "TI_DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw" PACKAGECONFIG:append:aarch64 = " atf optee" PACKAGECONFIG:append:j721e = " dm"
* As observed in the u-boot makefile [0][1], the argument anticipated by u-boot binman is "TI_DM" instead of "DM". Hence, fix the same in meta-ti-bsp. * The behavior went unnoticed until now because "ti-dm" was still being sourced from BINMAN_INDIRS, which referred to "ti-linux-firmware" and the PACKAGECONFIG[dm] feature was redundant. [0]: https://github.com/u-boot/u-boot/blob/v2025.01/Makefile#L1408 [1]: https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/Makefile?h=ti-u-boot-2025.01#n1409 Signed-off-by: Chirag Shilwant <c-shilwant@ti.com> --- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)