[U-Boot] [PATCH] spl: fit: Fixed incompatible type warning in spl_load_fit_image()

[York Sun]

On 09/15/2017 07:52 AM, Jean-Jacques Hiblot wrote:
> Hi Tom, York
> 
> 
> On 15/09/2017 14:53, Tom Rini wrote:
>> On Fri, Sep 15, 2017 at 09:46:29AM +0200, Jean-Jacques Hiblot wrote:
>>
>>> Warning introduced in commit 7264f29 (spl: fit: Eanble GZIP support for
>>> image decompression)
>>>
>>> Signed-off-by: Jean-Jacques Hiblot <jjhiblot at ti.com>
>>> ---
>>>    common/spl/spl_fit.c | 4 +++-
>>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
>>> index 49ccf1c..22d3161 100644
>>> --- a/common/spl/spl_fit.c
>>> +++ b/common/spl/spl_fit.c
>>> @@ -197,11 +197,13 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector,
>>>    	    IS_ENABLED(CONFIG_SPL_GZIP)		&&
>>>    	    image_comp == IH_COMP_GZIP		&&
>>>    	    type == IH_TYPE_KERNEL) {
>>> +		long unsigned int sz = length;
>>>    		if (gunzip((void *)load_addr, CONFIG_SYS_BOOTM_LEN,
>>> -			   src, &length)) {
>>> +			   src, &sz)) {
>>>    			puts("Uncompressing error\n");
>>>    			return -EIO;
>>>    		}
>>> +		length = sz;
>>>    	} else {
>>>    		memcpy((void *)load_addr, src, length);
>>>    	}
>> York posted a fix for this yesterday at
>> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fpatch%2F813927%2F&data=01%7C01%7Cyork.sun%40nxp.com%7Cc54125726efc412406b608d4fc495cd3%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=N11zEx1iLXn%2FpyXLiAqqQudsrh5SnOZxw1kAJISaOw4%3D&reserved=0 and since he introduced the
>> warning I'm going to grab that one, thanks!
> Sorry, I didn't check the mailing first.
> There is a potential issue with York's patch. I'll comment about it in
> the other thread.

I see what you mean. I should update the length after gunzip.

York