makefile: add multi_dtb_fit dep
PATCH 1/1 makefile: add multi_dtb_fit dep
With certain gcc compilers, the u-boot.itb is built immediately after dtb generation. If CONFIG_MULTI_DTB_FIT is used, it is possible that the fit-dtb.blob is not finished in time.
This patch adds a necessary dependency to guarantee that the fit-dtb.blob is built before attempting to build the u-boot.itb.
--- Makefile | 1 + 1 file changed, 1 insertion(+)
Makefile +1 -0
@@ -1425,6 +1425,7 @@ MKIMAGEFLAGS_u-boot.itb += -B 0x8 ifdef U_BOOT_ITS u-boot.itb: u-boot-nodtb.bin \ $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \ + $(if $(CONFIG_MULTI_DTB_FIT),$(FINAL_DTB_CONTAINER)) \ $(U_BOOT_ITS) FORCE $(call if_changed,mkfitimage) $(BOARD_SIZE_CHECK)
Signature · 1 line
2.17.1
Hi Neil,
Quoted 26 lines · Neal Frager
With certain gcc compilers, the u-boot.itb is built immediately after dtb generation. If
CONFIG_MULTI_DTB_FITis used, it is possible that the fit-dtb.blob is not finished in time.This patch adds a necessary dependency to guarantee that the fit-dtb.blob is built before attempting to build the u-boot.itb.
Signed-off-by Neal Frager <[email protected]>--- Makefile | 1 + 1 file changed, 1 insertion(+)Makefile +1
-1@@ -1425,6 +1425,7 @@ MKIMAGEFLAGS_u-boot.itb += -B 0x8 ifdef U_BOOT_ITS u-boot.itb: u-boot-nodtb.bin \ $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \ + $(if $(CONFIG_MULTI_DTB_FIT),$(FINAL_DTB_CONTAINER)) \ $(U_BOOT_ITS) FORCE $(call if_changed,mkfitimage) $(BOARD_SIZE_CHECK) --
Quoted 2 lines
2.17.1
I wonder if we should try to get this moved to binman?
Regards,
SImon
Hi Simon,
Quoted 26 lines
With certain gcc compilers, the u-boot.itb is built immediately after dtb generation. If
CONFIG_MULTI_DTB_FITis used, it is possible that the fit-dtb.blob is not finished in time.This patch adds a necessary dependency to guarantee that the fit-dtb.blob is built before attempting to build the u-boot.itb.
Signed-off-by Neal Frager <[email protected]>--- Makefile | 1 + 1 file changed, 1 insertion(+)Makefile +0
-0@@ -1425,6 +1425,7 @@ MKIMAGEFLAGS_u-boot.itb += -B 0x8 ifdef
U_BOOT_ITSu-boot.itb: u-boot-nodtb.bin \ $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \ + $(if $(CONFIG_MULTI_DTB_FIT),$(FINAL_DTB_CONTAINER)) \ $(U_BOOT_ITS) FORCE $(call if_changed,mkfitimage) $(BOARD_SIZE_CHECK)
Quoted 7 lines
--
2.17.1Reviewed-by Simon Glass <[email protected]>I wonder if we should try to get this moved to binman?
Thank you for the review! Yes, the next step will be to move to binman.
Best regards,
Neal Frager
AMD
Michal Simek
AppliedQuoted 17 lines · Neal Frager
With certain gcc compilers, the u-boot.itb is built immediately after dtb generation. If
CONFIG_MULTI_DTB_FITis used, it is possible that the fit-dtb.blob is not finished in time.This patch adds a necessary dependency to guarantee that the fit-dtb.blob is built before attempting to build the u-boot.itb.
Signed-off-by Neal Frager <[email protected]>--- Makefile | 1 + 1 file changed, 1 insertion(+)Makefile +0
-0
Makefile MKIMAGEFLAGS_u-boot.itb += -B 0x8 · line 1431
Quoted 7 lines
Makefile +1
-0@@ -1425,6 +1425,7 @@ MKIMAGEFLAGS_u-boot.itb += -B 0x8 ifdef U_BOOT_ITS u-boot.itb: u-boot-nodtb.bin \ $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \ + $(if $(CONFIG_MULTI_DTB_FIT),$(FINAL_DTB_CONTAINER)) \ $(U_BOOT_ITS) FORCE $(call if_changed,mkfitimage) $(BOARD_SIZE_CHECK)
Applied.
M