bootstage: powerpc: support fdt stash and reporting

[karo-tx-uboot.git] / common / cmd_dfu.c

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c
index 62fb8904cfeba02b6e6dd200034622e847822f9c..5547678208adf8753800bf76f68b4f7ad34869b8 100644 (file)
--- a/common/cmd_dfu.c
+++ b/common/cmd_dfu.c
@@ -5,59 +5,50 @@
  * authors: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
  *         Lukasz Majewski <l.majewski@samsung.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <command.h>
-#include <malloc.h>
 #include <dfu.h>
-#include <asm/errno.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       const char *str_env;
-       char s[] = "dfu";
-       char *env_bkp;
-       int ret;
-
-       if (argc < 3)
+       if (argc < 4)
                return CMD_RET_USAGE;
 
-       str_env = getenv("dfu_alt_info");
-       if (str_env == NULL) {
-               printf("%s: \"dfu_alt_info\" env variable not defined!\n",
-                      __func__);
-               return CMD_RET_FAILURE;
-       }
+       char *usb_controller = argv[1];
+       char *interface = argv[2];
+       char *devstring = argv[3];
 
-       env_bkp = strdup(str_env);
-       ret = dfu_config_entities(env_bkp, argv[1],
-                           (int)simple_strtoul(argv[2], NULL, 10));
+       char *s = "dfu";
+       int ret, i = 0;
+
+       ret = dfu_init_env_entities(interface, simple_strtoul(devstring,
+                                                             NULL, 10));
        if (ret)
-               return CMD_RET_FAILURE;
+               return ret;
 
-       if (strcmp(argv[3], "list") == 0) {
+       if (argc > 4 && strcmp(argv[4], "list") == 0) {
                dfu_show_entities();
                goto done;
        }
 
-       board_usb_init();
+       int controller_index = simple_strtoul(usb_controller, NULL, 0);
+       board_usb_init(controller_index, USB_INIT_DEVICE);
+
        g_dnl_register(s);
        while (1) {
+               if (dfu_reset())
+                       /*
+                        * This extra number of usb_gadget_handle_interrupts()
+                        * calls is necessary to assure correct transmission
+                        * completion with dfu-util
+                        */
+                       if (++i == 10)
+                               goto exit;
+
                if (ctrlc())
                        goto exit;
 
@@ -67,15 +58,18 @@ exit:
        g_dnl_unregister();
 done:
        dfu_free_entities();
-       free(env_bkp);
+
+       if (dfu_reset())
+               run_command("reset", 0);
 
        return CMD_RET_SUCCESS;
 }
 
 U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
        "Device Firmware Upgrade",
-       "<interface> <dev> [list]\n"
-       "  - device firmware upgrade on a device <dev>\n"
-       "    attached to interface <interface>\n"
-       "    [list] - list available alt settings"
+       "<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"
 );