arm: mxs: Fix mkimage invocation

Remove this ad-hoc mkimage invocation in MXS Makefile and replace it with the standard mkimage rule instead.

This patch fixes recent build issues introduced by the patch 92a655c mkimage: Set up a file size parameter and keep it updated These build issues could be triggered by building for example the MX28EVK and the u-boot.sb image:

$ make mx28evk_defconfig
$ make V=1 u-boot.sb
[...]
make -f ./scripts/Makefile.build obj=arch/arm/cpu/arm926ejs/mxs u-boot.sb
  ./tools/mkimage -n arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg -T mxsimage u-boot.sb
./tools/mkimage: Can't open (null): Bad address
arch/arm/cpu/arm926ejs/mxs/Makefile:82: recipe for target 'u-boot.sb' failed
make[1]: *** [u-boot.sb] Error 1
Makefile:989: recipe for target 'u-boot.sb' failed
make: *** [u-boot.sb] Error 2

With this patch:
./tools/mkimage -n arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg -T mxsimage -d arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg u-boot.sb

Signed-off-by Marek Vasut <[email protected]>

Cc Simon Glass <[email protected]>

Cc Juha Lumme <[email protected]>

---
 arch/arm/cpu/arm926ejs/mxs/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

arch/arm/cpu/arm926ejs/mxs/Makefile +4 -7

index 6c59494..71c2c0e 100644
@@ -74,12 +74,10 @@ u-boot.csf: u-boot.ivt u-boot.bin board/$(VENDOR)/$(BOARD)/sign/u-boot.csf
 %.sig: %.csf
        $(call if_changed,mkcst_mxs)
 
-quiet_cmd_mkimage_mxs = MKIMAGE $@
-cmd_mkimage_mxs = $(objtree)/tools/mkimage -n $< -T mxsimage $@ \
-       $(if $(KBUILD_VERBOSE:1=), >/dev/null)
-
+MKIMAGEFLAGS_u-boot.sb = -n $< -T mxsimage
 u-boot.sb: $(src)/$(MKIMAGE_TARGET-y) u-boot.bin spl/u-boot-spl.bin FORCE
-       $(call if_changed,mkimage_mxs)
+       $(call if_changed,mkimage)
 
+MKIMAGEFLAGS_u-boot-signed.sb = -n $< -T mxsimage
 u-boot-signed.sb: $(src)/mxsimage-signed.cfg u-boot.ivt u-boot.sig spl/u-boot-spl.ivt spl/u-boot-spl.sig FORCE
-       $(call if_changed,mkimage_mxs)
+       $(call if_changed,mkimage)
--

2.1.4

Hi Marek,

Reviewed-by Simon Glass <[email protected]>

Sorry for the breakage. I had an weird issue with my original patch on the boards you mention and started chasing it down. But then I forgot about it and for some reason did not see failures with buildman. It's good that you figured it out.

Let me know if you want me to pick this up.

Quoted 1 line · Simon Glass

Hi Marek,

Hi Simon,

Quoted 7 lines

Reviewed-by Simon Glass <[email protected]>

Sorry for the breakage. I had an weird issue with my original patch on the boards you mention and started chasing it down. But then I forgot about it and for some reason did not see failures with buildman. It's good that you figured it out.

Quoted 1 line

Let me know if you want me to pick this up.

No problem, glad it helped. Feel free to pick it up, but maybe wait for Stefano's ACK first as he's the i.MX maintainer?

Hi Marek,

Quoted 12 lines · Marek Vasut

Quoted 1 line · Simon Glass

Hi Marek,

Hi Simon,

Quoted 7 lines

Reviewed-by Simon Glass <[email protected]>

Sorry for the breakage. I had an weird issue with my original patch on the boards you mention and started chasing it down. But then I forgot about it and for some reason did not see failures with buildman. It's good that you figured it out.

Quoted 4 lines

Quoted 1 line

Let me know if you want me to pick this up.

No problem, glad it helped. Feel free to pick it up, but maybe wait for Stefano's ACK first as he's the i.MX maintainer?

Ah OK, probably best for Stefano to do this.