Hi Marek
I am preparing a STM32 pull request which includes this series
https://patchwork.ozlabs.org/project/uboot/patch/20221206023515.113556-1-mar...
We got a DFU compilation issue with this series :
arm: + stm32mp15_dhcom_basic +/usr/lib/python3/dist-packages/setuptools/dist.py:473: UserWarning: Normalizing '2023.01' to '2023.1' + warnings.warn( +arm-linux-gnueabi-ld.bfd: drivers/dfu/dfu.o: in function `dfu_fill_entity': +drivers/dfu/dfu.c:548: undefined reference to `dfu_fill_entity_virt' +make[2]: *** [scripts/Makefile.spl:527: spl/u-boot-spl] Error 1 +make[1]: *** [Makefile:2071: spl/u-boot-spl] Error 2 +make: *** [Makefile:177: sub-make] Error 2 arm: + stm32mp15_dhcor_basic +/usr/lib/python3/dist-packages/setuptools/dist.py:473: UserWarning: Normalizing '2023.01' to '2023.1' + warnings.warn( +arm-linux-gnueabi-ld.bfd: drivers/dfu/dfu.o: in function `dfu_fill_entity': +drivers/dfu/dfu.c:548: undefined reference to `dfu_fill_entity_virt' +make[2]: *** [scripts/Makefile.spl:527: spl/u-boot-spl] Error 1 +make[1]: *** [Makefile:2071: spl/u-boot-spl] Error 2 +make: *** [Makefile:177: sub-make] Error 2
The correct fix is this patch below which is currently in your usb/master branch. I propose to take this patch in my pull request (available today or tomorrow) to make GitLab Ci tests happy.
Are you OK ?
Thanks Patrice
On 12/4/22 19:55, Marek Vasut wrote:
On 11/30/22 11:42, Patrick Delaunay wrote:
Define stub for dfu_*_virt function in SPL, because CONFIG_SPL_DFU_VIRT is not defined.
This patch avoids compilation issue in dfu_fill_entity() when CONFIG_SPL_DFU is activated because the dfu_fill_entity_virt() function is not available.
Fixes: ec44cace4b8d2 ("dfu: add DFU virtual backend") Reported-by: Marek Vasut marex@denx.de Signed-off-by: Patrick Delaunay patrick.delaunay@foss.st.com
See initial patch proposal: http://patchwork.ozlabs.org/project/uboot/patch/20221128193917.236188-1-mare...
include/dfu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/dfu.h b/include/dfu.h index dcb9cd9d799a..07922224ef19 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -495,7 +495,7 @@ static inline int dfu_fill_entity_mtd(struct dfu_entity *dfu, char *devstr, } #endif -#ifdef CONFIG_DFU_VIRT +#if CONFIG_IS_ENABLED(DFU_VIRT) int dfu_fill_entity_virt(struct dfu_entity *dfu, char *devstr, char **argv, int argc); int dfu_write_medium_virt(struct dfu_entity *dfu, u64 offset,
Reviewed-by: Marek Vasut marex@denx.de Tested-by: Marek Vasut marex@denx.de _______________________________________________ Uboot-stm32 mailing list Uboot-stm32@st-md-mailman.stormreply.com https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32