Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86

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

diff --git a/cmd/thordown.c b/cmd/thordown.c
index e297de23a0ef7549c3e5f0e5a20baeaf43851440..8dae024e31db2bc601c617c4a302932a66a5e4bf 100644 (file)
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -30,32 +30,37 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                goto done;
 
        int controller_index = simple_strtoul(usb_controller, NULL, 0);
-       ret = board_usb_init(controller_index, USB_INIT_DEVICE);
+       ret = usb_gadget_initialize(controller_index);
        if (ret) {
-               pr_err("USB init failed: %d", ret);
+               pr_err("USB init failed: %d\n", ret);
                ret = CMD_RET_FAILURE;
                goto exit;
        }
 
-       g_dnl_register("usb_dnl_thor");
+       ret = g_dnl_register("usb_dnl_thor");
+       if (ret) {
+               pr_err("g_dnl_register failed %d\n", ret);
+               ret = CMD_RET_FAILURE;
+               goto exit;
+       }
 
        ret = thor_init();
        if (ret) {
-               pr_err("THOR DOWNLOAD failed: %d", ret);
+               pr_err("THOR DOWNLOAD failed: %d\n", ret);
                ret = CMD_RET_FAILURE;
                goto exit;
        }
 
        ret = thor_handle();
        if (ret) {
-               pr_err("THOR failed: %d", ret);
+               pr_err("THOR failed: %d\n", ret);
                ret = CMD_RET_FAILURE;
                goto exit;
        }
 
 exit:
        g_dnl_unregister();
-       board_usb_cleanup(controller_index, USB_INIT_DEVICE);
+       usb_gadget_release(controller_index);
 done:
        dfu_free_entities();
 
@@ -65,7 +70,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"
 );