On 2/1/21 2:09 PM, Fabio Estevam wrote:
On Mon, Feb 1, 2021 at 10:01 AM Marek Vasut <ma...@denx.de> wrote:
I think
u-boot-with-spl.imx: SPL u-boot.uim FORCE
should really be
u-boot-with-spl.imx: SPL u-boot.img FORCE
under certain (which ?) conditions.
Can you take a look into that ?
I tried your suggestion and it boots now:
U-Boot SPL 2021.01-dirty (Feb 01 2021 - 10:07:21 -0300)
Trying to boot from MMC1
U-Boot 2021.01-dirty (Feb 01 2021 - 10:07:21 -0300)
But, it also likely breaks other boards, which still use plain uImage
instead of fitImage. So there needs to be some conditional in the Makefile.
Something like this maybe ?
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 1aa26a50ad..e6b4654cd3 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 $@
