X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_dfu.c;h=a03538dabb370c320815aa12637fae31e5eccd3c;hb=ed32522fe048f9edcb3269c8d5af79c6e8c6daea;hp=7ce92cec87f4fcb156b2d84ff487cb319635f6a4;hpb=f835c77fb7e57508ffe8d8ca3a092ee28add77b2;p=u-boot

diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c
index 7ce92cec87..a03538dabb 100644
--- a/common/cmd_dfu.c
+++ b/common/cmd_dfu.c
@@ -11,29 +11,33 @@
 #include <common.h>
 #include <dfu.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	char *s = "dfu";
-	int ret, i = 0;
-
-	if (argc < 3)
+	if (argc < 4)
 		return CMD_RET_USAGE;
 
-	ret = dfu_init_env_entities(argv[1], simple_strtoul(argv[2], NULL, 10));
+	char *usb_controller = argv[1];
+	char *interface = argv[2];
+	char *devstring = argv[3];
+
+	int ret, i = 0;
+
+	ret = dfu_init_env_entities(interface, simple_strtoul(devstring,
+							      NULL, 10));
 	if (ret)
 		return ret;
 
-	if (argc > 3 && strcmp(argv[3], "list") == 0) {
+	if (argc > 4 && strcmp(argv[4], "list") == 0) {
 		dfu_show_entities();
 		goto done;
 	}
 
-#ifdef CONFIG_TRATS
-	board_usb_init();
-#endif
+	int controller_index = simple_strtoul(usb_controller, NULL, 0);
+	board_usb_init(controller_index, USB_INIT_DEVICE);
 
-	g_dnl_register(s);
+	g_dnl_register("usb_dnl_dfu");
 	while (1) {
 		if (dfu_reset())
 			/*
@@ -62,8 +66,9 @@ done:
 
 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"
 );