[PATCH 6/8] binman: Avoid skipping binman_init()

Jerome Forissier jerome.forissier at linaro.org
Mon Dec 2 09:29:19 CET 2024



On 12/1/24 17:50, Tom Rini wrote:
> On Sun, Dec 01, 2024 at 07:42:34AM -0700, Simon Glass wrote:
>> A recent lwip change stopped binman's init from working, so it is not
>> possible to read nodes from the image description anymore.
>>
>> Correct this by dropping the offending line.
>>
>> Signed-off-by: Simon Glass <sjg at chromium.org>
>> Fixes: 4d4d7838127 net: lwip: add TFTP support and tftpboot command
>> ---
>>
>>  lib/binman.c | 1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/lib/binman.c b/lib/binman.c
>> index 93d85548116..9047f5275f3 100644
>> --- a/lib/binman.c
>> +++ b/lib/binman.c
>> @@ -137,7 +137,6 @@ int binman_init(void)
>>  {
>>  	int ret;
>>  
>> -	return 0;
>>  	binman = malloc(sizeof(struct binman_info));
>>  	if (!binman)
>>  		return log_msg_ret("space for binman", -ENOMEM);
> 
> Erm, Jerome, do you recall why you were doing that at all to start with?
> Or some sort of mis-merge locally that was (sadly) missed on review.

Oops! It is a local hack I had in my branch to run tests on the i.MX8MPlus
EVK with NET_LWIP enabled. On that board I would keep getting errors like:

 initcall failed at call 0000000040222de0 (err=-11)
 ### ERROR ### Please RESET the board ###

...and the "return 0'; was a quick way to work around to proceed with
testing.

Sorry for inadvertently leaving it in :-/ Now I suppose I should try again
the imx8mp_evk_defconfig build and see if the issue is still there and needs
investigating.

Regards,
-- 
Jerome





More information about the U-Boot mailing list