diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-23 13:04:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-23 13:04:48 -0500 |
| commit | 1c124d379dbb78a93495202749efe952fbddba1c (patch) | |
| tree | 0a402df7f30b79cc9321061b778eb56ca0a5cea9 /cmd/dfu.c | |
| parent | 9ab81fcc8a0181cc19b8234d0e7632bd09c27c83 (diff) | |
| parent | b0cce3f90f546da0c1e0dda5abcaf05d81078b0d (diff) | |
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'cmd/dfu.c')
| -rw-r--r-- | cmd/dfu.c | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -25,12 +25,14 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc < 4) return CMD_RET_USAGE; +#ifdef CONFIG_DFU_OVER_USB char *usb_controller = argv[1]; +#endif char *interface = argv[2]; char *devstring = argv[3]; - int ret; -#ifdef CONFIG_DFU_TFTP + int ret = 0; +#ifdef CONFIG_DFU_OVER_TFTP unsigned long addr = 0; if (!strcmp(argv[1], "tftp")) { if (argc == 5) @@ -39,7 +41,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return update_tftp(addr, interface, devstring); } #endif - +#ifdef CONFIG_DFU_OVER_USB ret = dfu_init_env_entities(interface, devstring); if (ret) goto done; @@ -56,18 +58,24 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) done: dfu_free_entities(); +#endif return ret; } U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu, "Device Firmware Upgrade", +#ifdef CONFIG_DFU_OVER_USB "<USB_controller> <interface> <dev> [list]\n" " - device firmware upgrade via <USB_controller>\n" " on device <dev>, attached to interface\n" " <interface>\n" " [list] - list available alt settings\n" -#ifdef CONFIG_DFU_TFTP - "dfu tftp <interface> <dev> [<addr>]\n" +#endif +#ifdef CONFIG_DFU_OVER_TFTP +#ifdef CONFIG_DFU_OVER_USB + "dfu " +#endif + "tftp <interface> <dev> [<addr>]\n" " - device firmware upgrade via TFTP\n" " on device <dev>, attached to interface\n" " <interface>\n" |