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

[Tom Rini]

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.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20241201/9e0aef3d/attachment.sig>