From bfbe87590f32d5c22e4aad4e6ca91be8b55fe722 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Sat, 28 Mar 2020 18:15:15 +0800 Subject: [PATCH] cmd: bootuimage: return -1 as error code support autoboot to traverse all bootcmd list. Signed-off-by: Joseph Chen Change-Id: I03f10a5982c4a9bb0eee429f756dd19c027c3371 --- cmd/bootuimage.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/bootuimage.c b/cmd/bootuimage.c index 4be0cf1c68..1b4122c02d 100644 --- a/cmd/bootuimage.c +++ b/cmd/bootuimage.c @@ -70,11 +70,11 @@ static int do_boot_uimage(cmd_tbl_t *cmdtp, int flag, if (!img) { UIMG_I("Failed to load multi images\n"); - return -EINVAL; + goto out; } if (uimage_sysmem_reserve_each(img, &ramdisk_sz)) - return -ENOMEM; + goto out; snprintf(uimg_addr, sizeof(uimg_addr), "0x%lx", (ulong)img); bootm_args[0] = uimg_addr; @@ -91,10 +91,14 @@ static int do_boot_uimage(cmd_tbl_t *cmdtp, int flag, BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO, &images, 1); - if (ret && argc != 1) + if (ret && argc != 1) { uimage_sysmem_free_each(img, ramdisk_sz); + ret = -1; + } return ret; +out: + return -1; } U_BOOT_CMD(