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 dd0544d475723d14ce6bd298963ca62e411d42ed..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;
@@ -40,23 +41,29 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        ret = g_dnl_register("usb_dnl_thor");
        if (ret) {
                pr_err("g_dnl_register failed %d\n", ret);
-               return ret;
-       }
-
-       ret = thor_init();
-       if (ret) {
-               pr_err("THOR DOWNLOAD 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);