[U-Boot] [PATCH] Repair image-fit: switch ENOLINK to ENOENT

Marek Vasut marex at denx.de
Sun Sep 18 15:27:31 CEST 2016


This patch broke booting of any fitImage-wrapped kernel images due
to replacement of ENOLINK with ENOENT without checking where the
ENOLINK return value is being tested for. Adjust the tests as well
to repair the breakage.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Jonathan Gray <jsg at jsg.id.au>
Cc: Paul Burton <paul.burton at imgtec.com>
Cc: Tom Rini <trini at konsulko.com>
---
 common/image-fdt.c | 2 +-
 common/image.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/image-fdt.c b/common/image-fdt.c
index d6ee225..3d23608 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -285,7 +285,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
 			fdt_noffset = fit_get_node_from_config(images,
 							       FIT_FDT_PROP,
 							       fdt_addr);
-			if (fdt_noffset == -ENOLINK)
+			if (fdt_noffset == -ENOENT)
 				return 0;
 			else if (fdt_noffset < 0)
 				return 1;
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.3



More information about the U-Boot mailing list