bootm: Handle errors consistently

From: Simon Glass <[email protected]>

A recent bootm fix left the error path incomplete. If CONFIG_TRACE is set it may still not be a supported command, so cover that with the unsupported subcommand print. Once we handle BOOTM_STATE_OS_GO, we can just move into the error handler itself, no need for a goto there.

Signed-off-by Simon Glass <[email protected]>

[trini: Update slightly based on Simon's changes to also cover CONFIG_TRACE/BOOTM_STATE_FAKE_OS_GO]

Signed-off-by Tom Rini <[email protected]>

---
 common/cmd_bootm.c |   21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

common/cmd_bootm.c +0 -7

index a783cea..6caa0e9 100644
@@ -705,13 +705,6 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int
 flag, int argc,
        if (!ret && (states & BOOTM_STATE_OS_PREP))
                ret = boot_fn(BOOTM_STATE_OS_PREP, argc, argv, images);
 
-       /* Check for unsupported subcommand. */
-       if (ret) {
-               puts("subcommand not supported\n");
-               return ret;
-       }
-
-
 #ifdef CONFIG_TRACE
        /* Pretend to run the OS, then run a user command */

        if (!ret && (states & BOOTM_STATE_OS_FAKE_GO)) {

common/cmd_bootm.c +8 -6

@@ -723,15 +716,17 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int
 flag, int argc,
                        ret = run_command_list(cmd_list, -1, flag);
        }
 #endif
+
+       /* Check for unsupported subcommand. */
+       if (ret) {
+               puts("subcommand not supported\n");
+               return ret;
+       }
+
        /* Now run the OS! We hope this doesn't return */
-       if (!ret && (states & BOOTM_STATE_OS_GO)) {
+       if (!ret && (states & BOOTM_STATE_OS_GO))
                ret = boot_selected_os(argc, argv, BOOTM_STATE_OS_GO,
                                images, boot_fn);
-               if (ret)
-                       goto err;
-       }
-
-       return ret;
 
        /* Deal with any fallout */

err:
--
1.7.9.5

From: Simon Glass <[email protected]>

A recent bootm fix left the error path incomplete. If CONFIG_TRACE is set it may still not be a supported command, so cover that with the unsupported subcommand print. Once we handle BOOTM_STATE_OS_GO, we can just move into the error handler itself, no need for a goto there.

Signed-off-by Simon Glass <[email protected]>

[trini: Update slightly based on Simon's changes to also cover CONFIG_TRACE/BOOTM_STATE_FAKE_OS_GO]

Signed-off-by Tom Rini <[email protected]>