Hi Marek,
On 01.02.21 21:07, Marek Vasut wrote:
The u-boot-with-spl.imx is a concatenation of SPL and u-boot.uim. The u-boot.uim is u-boot.bin wrapped in uImage. In case OF_SEPARATE is enabled, the u-boot.bin does not contain control DT for U-Boot, and so u-boot.uim does not contain the DT, and so u-boot-with-spl.imx does not contain the DT, and a system where u-boot-with-spl.imx is written to offset 1024B to the start of storage no longer boots, as it is missing DT. In case OF_SEPARATE is enabled, u-boot.img contains both u-boot.bin and the necessary DTs. Therefore, use u-boot.img instead of u-boot.uim to generate u-boot-with-spl.imx when OF_SEPARATE is enabled. Tested-by: Fabio Estevam <feste...@gmail.com> Signed-off-by: Marek Vasut <ma...@denx.de> Cc: Christoph Niedermaier <cniederma...@dh-electronics.de> Cc: Fabio Estevam <feste...@gmail.com> Cc: Peng Fan <peng....@nxp.com> Cc: Simon Glass <s...@chromium.org> Cc: Stefano Babic <sba...@denx.de> Cc: Ye Li <ye...@nxp.com> Cc: uboot-imx <uboot-...@nxp.com> --- V2: Swap the u-boot.uim <-> u-boot.img in the conditional so this would match the patch which Fabio originally tested --- arch/arm/mach-imx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 1aa26a50ad8..e6b4654cd35 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -202,10 +202,10 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ quiet_cmd_pad_cat = CAT $@ cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@-u-boot-with-spl.imx: SPL u-boot.uim FORCE+u-boot-with-spl.imx: SPL $(if $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE $(call if_changed,pad_cat)-u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx u-boot.uim FORCE+u-boot-with-nand-spl.imx: spl/u-boot-nand-spl.imx $(if $(CONFIG_OF_SEPARATE),u-boot.img,u-boot.uim) FORCE $(call if_changed,pad_cat)quiet_cmd_u-boot-nand-spl_imx = GEN $@
This patch breaks build for two boards, udoo and ot1200_spl. Strange enough, I get weird results with git bisect (but definetely this is the only patch I am applying that cause the issue).
Could you take a look, please ? Thanks, Stefano Thanks, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de =====================================================================
