From 67d668bf926ae50a1196a8561ae5075fd69a8eb2 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 5 Jun 2011 13:43:02 +0000 Subject: autostart: unify duplicated logic into the bootm code Rather than having a bunch of random commands handle autostart behavior, unify the logic in a single place. This also fixes building of these different commands when bootm is disabled. Acked-by: Matthew McClintock Acked-by: Scott Wood Signed-off-by: Mike Frysinger --- common/cmd_fdos.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'common/cmd_fdos.c') diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c index 2af4ca0efe..d714af8db9 100644 --- a/common/cmd_fdos.c +++ b/common/cmd_fdos.c @@ -40,7 +40,6 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *name; char *ep; int size; - int rcode = 0; char buf [12]; int drive = CONFIG_SYS_FDC_DRIVE_NUMBER; @@ -98,15 +97,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("Floppy DOS load complete: %d bytes loaded to 0x%lx\n", size, load_addr); - /* Check if we should attempt an auto-start */ - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { - char *local_args[2]; - local_args[0] = argv[0]; - local_args[1] = NULL; - printf ("Automatic boot of image at addr 0x%08lX ...\n", load_addr); - rcode = do_bootm (cmdtp, 0, 1, local_args); - } - return rcode; + return bootm_maybe_autostart(cmdtp, argv[0]); } /*----------------------------------------------------------------------------- -- cgit v1.2.1