Re: [U-Boot] [PATCH] image: Fix expected return value

[Simon Glass]

On 16 September 2016 at 06:34, Mario Six  wrote:
> Commit bac17b7 ("image-fit: switch ENOLINK to ENOENT") changed the
> return value of fit_get_node_from_config from ENOLINK to ENOENT.
>
> This causes a problem in boot_get_ramdisk, which treats the return value
> -ENOLINK differently from other errors (namely, it does not signal a
> failure if -ENOLINK is returned). As a result, booting a FIT image on
> the Armada platform (and possibly others) fails with a "Ramdisk image is
> corrupt or invalid" message, rendering FIT images unusable.
>
> This patch fixes the error by changing the "special" return value in
> boot_get_ramdisk from -ENOLINK to -ENOENT, so that the original behavior
> is restored.
>
> Reviewed-by: Jonathan Gray 
> Signed-off-by: Mario Six 
> ---
>  common/image.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH] image: Fix expected return value

[Mario Six]

Commit bac17b7 ("image-fit: switch ENOLINK to ENOENT") changed the
return value of fit_get_node_from_config from ENOLINK to ENOENT.

This causes a problem in boot_get_ramdisk, which treats the return value
-ENOLINK differently from other errors (namely, it does not signal a
failure if -ENOLINK is returned). As a result, booting a FIT image on
the Armada platform (and possibly others) fails with a "Ramdisk image is
corrupt or invalid" message, rendering FIT images unusable.

This patch fixes the error by changing the "special" return value in
boot_get_ramdisk from -ENOLINK to -ENOENT, so that the original behavior
is restored.

Reviewed-by: Jonathan Gray 
Signed-off-by: Mario Six 
---
 common/image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/image.c b/common/image.c
index 7ad04ca..c8d9bc8 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1078,7 +1078,7 @@ int boot_get_ramdisk(int argc, char * const argv[], 
bootm_headers_t *images,
rd_addr = map_to_sysmem(images->fit_hdr_os);
rd_noffset = fit_get_node_from_config(images,
FIT_RAMDISK_PROP, rd_addr);
-   if (rd_noffset == -ENOLINK)
+   if (rd_noffset == -ENOENT)
return 0;
else if (rd_noffset < 0)
return 1;
-- 
2.9.0

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot