board: stm32mp1: Remove gpio_hog_probe_all() from board

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

diff --git a/cmd/thordown.c b/cmd/thordown.c
index ce3660d174791b378c8e4b16a849a9c9b2fdc04e..838764ccef79b98ae9f9b029b90090c1cbe53695 100644 (file)
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -7,12 +7,13 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <thor.h>
 #include <dfu.h>
 #include <g_dnl.h>
 #include <usb.h>
 
-int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        if (argc < 4)
                return CMD_RET_USAGE;
@@ -37,22 +38,32 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                goto exit;
        }
 
-       g_dnl_register("usb_dnl_thor");
-
-       ret = thor_init();
+       ret = g_dnl_register("usb_dnl_thor");
        if (ret) {
-               pr_err("THOR DOWNLOAD failed: %d\n", ret);
+               pr_err("g_dnl_register failed %d\n", ret);
                ret = CMD_RET_FAILURE;
                goto exit;
        }
 
-       ret = thor_handle();
+       ret = thor_init();
        if (ret) {
-               pr_err("THOR failed: %d\n", ret);
+               pr_err("THOR DOWNLOAD failed: %d\n", ret);
                ret = CMD_RET_FAILURE;
                goto exit;
        }
 
+       do {
+               ret = thor_handle();
+               if (ret == THOR_DFU_REINIT_NEEDED) {
+                       dfu_free_entities();
+                       ret = dfu_init_env_entities(interface, devstring);
+               }
+               if (ret) {
+                       pr_err("THOR failed: %d\n", ret);
+                       ret = CMD_RET_FAILURE;
+                       goto exit;
+               }
+       } while (ret == 0);
 exit:
        g_dnl_unregister();
        usb_gadget_release(controller_index);
@@ -65,7 +76,7 @@ done:
 U_BOOT_CMD(thordown, CONFIG_SYS_MAXARGS, 1, do_thor_down,
           "TIZEN \"THOR\" downloader",
           "<USB_controller> <interface> <dev>\n"
-          "  - device software upgrade via LTHOR TIZEN dowload\n"
+          "  - device software upgrade via LTHOR TIZEN download\n"
           "    program via <USB_controller> on device <dev>,\n"
           "    attached to interface <interface>\n"
 );