Merge tag 'u-boot-dfu-20241017' of https://source.denx.de/u-boot/custodians/u-boot-dfu

[J-u-boot.git] / cmd / dfu.c

diff --git a/cmd/dfu.c b/cmd/dfu.c
index 76b89ca5ed6372bfa9b9ecd7cb4feeaa71fbd12b..46f0190588e05b160c2eb3071ab8e229e512c77d 100644 (file)
--- a/cmd/dfu.c
+++ b/cmd/dfu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cmd_dfu.c -- dfu command
  *
@@ -7,11 +8,9 @@
  * Copyright (C) 2012 Samsung Electronics
  * authors: Andrzej Pietrasiewicz <[email protected]>
  *         Lukasz Majewski <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
+#include <command.h>
 #include <watchdog.h>
 #include <dfu.h>
 #include <console.h>
@@ -19,63 +18,92 @@
 #include <usb.h>
 #include <net.h>
 
-static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_dfu(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
 
-       if (argc < 4)
+       if (argc < 2)
                return CMD_RET_USAGE;
 
-#ifdef CONFIG_USB_FUNCTION_DFU
+#ifdef CONFIG_DFU_OVER_USB
        char *usb_controller = argv[1];
 #endif
-       char *interface = argv[2];
-       char *devstring = argv[3];
+       char *interface = NULL;
+       char *devstring = NULL;
+#if defined(CONFIG_DFU_TIMEOUT) || defined(CONFIG_DFU_OVER_TFTP)
+       unsigned long value = 0;
+#endif
+       if (argc >= 4) {
+               interface = argv[2];
+               devstring = argv[3];
+       }
 
-       int ret = 0;
-#ifdef CONFIG_TFTP_FUNCTION_DFU
-       unsigned long addr = 0;
-       if (!strcmp(argv[1], "tftp")) {
-               if (argc == 5)
-                       addr = simple_strtoul(argv[4], NULL, 0);
+#if defined(CONFIG_DFU_TIMEOUT) || defined(CONFIG_DFU_OVER_TFTP)
+       if (argc == 5 || argc == 3)
+               value = simple_strtoul(argv[argc - 1], NULL, 0);
+#endif
 
-               return update_tftp(addr, interface, devstring);
-       }
+       int ret = 0;
+#ifdef CONFIG_DFU_OVER_TFTP
+       if (!strcmp(argv[1], "tftp"))
+               return update_tftp(value, interface, devstring);
 #endif
-#ifdef CONFIG_USB_FUNCTION_DFU
        ret = dfu_init_env_entities(interface, devstring);
        if (ret)
                goto done;
 
+#ifdef CONFIG_DFU_TIMEOUT
+       dfu_set_timeout(value * 1000);
+#endif
+
        ret = CMD_RET_SUCCESS;
-       if (argc > 4 && strcmp(argv[4], "list") == 0) {
+       if (strcmp(argv[argc - 1], "list") == 0) {
                dfu_show_entities();
                goto done;
        }
 
+#ifdef CONFIG_DFU_OVER_USB
        int controller_index = simple_strtoul(usb_controller, NULL, 0);
+       bool retry = false;
+       do {
+               ret = run_usb_dnl_gadget(controller_index, "usb_dnl_dfu");
 
-       run_usb_dnl_gadget(controller_index, "usb_dnl_dfu");
+               if (dfu_reinit_needed) {
+                       dfu_free_entities();
+                       ret = dfu_init_env_entities(interface, devstring);
+                       if (ret)
+                               goto done;
+                       retry = true;
+               }
+       } while (retry);
 
+#endif
 done:
        dfu_free_entities();
-#endif
        return ret;
 }
 
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
        "Device Firmware Upgrade",
-#ifdef CONFIG_USB_FUNCTION_DFU
-       "<USB_controller> <interface> <dev> [list]\n"
+       ""
+#ifdef CONFIG_DFU_OVER_USB
+#ifdef CONFIG_DFU_TIMEOUT
+       "<USB_controller> [<interface> <dev>] [<timeout>] [list]\n"
+#else
+       "<USB_controller> [<interface> <dev>] [list]\n"
+#endif
        "  - 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_TIMEOUT
+       "    [<timeout>] - specify inactivity timeout in seconds\n"
+#endif
 #endif
-#ifdef CONFIG_TFTP_FUNCTION_DFU
-#ifdef CONFIG_USB_FUNCTION_DFU
+       "    [list] - list available alt settings\n"
+#ifdef CONFIG_DFU_OVER_TFTP
+#ifdef CONFIG_DFU_OVER_USB
        "dfu "
 #endif
-       "tftp <interface> <dev> [<addr>]\n"
+       "tftp [<interface> <dev>] [<addr>]\n"
        "  - device firmware upgrade via TFTP\n"
        "    on device <dev>, attached to interface\n"
        "    <interface>\n"