summaryrefslogtreecommitdiff
path: root/common/cmd_usb.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-06-05 13:43:02 +0000
committerWolfgang Denk <wd@denx.de>2011-07-25 22:18:26 +0200
commit67d668bf926ae50a1196a8561ae5075fd69a8eb2 (patch)
treea5f7e905a55b5f32718a1d1ac7616e9eb995e9be /common/cmd_usb.c
parent51f924e5ce4f69659ef385739f4604054d9b5bb7 (diff)
downloadu-boot-imx-67d668bf926ae50a1196a8561ae5075fd69a8eb2.zip
u-boot-imx-67d668bf926ae50a1196a8561ae5075fd69a8eb2.tar.gz
u-boot-imx-67d668bf926ae50a1196a8561ae5075fd69a8eb2.tar.bz2
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_usb.c')
-rw-r--r--common/cmd_usb.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 3ba6fff..cd4d417 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -356,7 +356,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
char *boot_device = NULL;
char *ep;
- int dev, part = 1, rcode;
+ int dev, part = 1;
ulong addr, cnt;
disk_partition_t info;
image_header_t *hdr;
@@ -490,16 +490,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
flush_cache(addr, (cnt+1)*info.blksz);
- /* 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", addr);
- rcode = do_bootm(cmdtp, 0, 1, local_args);
- return rcode;
- }
- return 0;
+ return bootm_maybe_autostart(cmdtp, argv[0]);
}
#endif /* CONFIG_USB_STORAGE */