diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-06-05 13:43:02 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-25 22:18:26 +0200 |
| commit | 67d668bf926ae50a1196a8561ae5075fd69a8eb2 (patch) | |
| tree | a5f7e905a55b5f32718a1d1ac7616e9eb995e9be /common/cmd_nand.c | |
| parent | 51f924e5ce4f69659ef385739f4604054d9b5bb7 (diff) | |
| download | u-boot-67d668bf926ae50a1196a8561ae5075fd69a8eb2.tar.gz u-boot-67d668bf926ae50a1196a8561ae5075fd69a8eb2.tar.bz2 u-boot-67d668bf926ae50a1196a8561ae5075fd69a8eb2.zip | |
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 <msm@freescale.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/cmd_nand.c')
| -rw-r--r-- | common/cmd_nand.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index b767cd2877..66e06a5e39 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -741,7 +741,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, ulong offset, ulong addr, char *cmd) { int r; - char *ep, *s; + char *s; size_t cnt; image_header_t *hdr; #if defined(CONFIG_FIT) @@ -816,19 +816,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, load_addr = 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] = cmd; - local_args[1] = NULL; - - printf("Automatic boot of image at addr 0x%08lx ...\n", addr); - - do_bootm(cmdtp, 0, 1, local_args); - return 1; - } - return 0; + return bootm_maybe_autostart(cmdtp, cmd); } int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) |