[PATCH V2] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if OF_SEPARATE=y

[Stefano Babic]

On 01.03.21 14:36, Marek Vasut wrote:
> On 3/1/21 10:27 AM, Stefano Babic wrote:
>> Hi Marek,
> 
> Hi,
> 
> [...]
> 
>>> 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 ?
> 
> There is V3 already, does that work?
> [PATCH V3] ARM: imx: Include u-boot.img in u-boot-with-spl.imx if 
> OF_SEPARATE=y

I pick it up and let you know, thanks.

Regards,
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: sbabic at denx.de
=====================================================================