projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'video-for-2020.01' of https://gitlab.denx.de/u-boot/custodians/u-boot...
[oweals/u-boot.git]
/
common
/
dfu.c
diff --git
a/common/dfu.c
b/common/dfu.c
index 4c529f7c36f909a2797b92478653aa2bbde6899d..44d1484d3d277f5b17c4dce7c36d90ce78de6c51 100644
(file)
--- a/
common/dfu.c
+++ b/
common/dfu.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* dfu.c -- dfu command
*
/*
* dfu.c -- dfu command
*
@@
-7,8
+8,6
@@
* Copyright (C) 2012 Samsung Electronics
* authors: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
* Lukasz Majewski <l.majewski@samsung.com>
* Copyright (C) 2012 Samsung Electronics
* authors: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
* Lukasz Majewski <l.majewski@samsung.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-24,11
+23,15
@@
int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)
bool dfu_reset = false;
int ret, i = 0;
bool dfu_reset = false;
int ret, i = 0;
- board_usb_init(usbctrl_index, USB_INIT_DEVICE);
+ ret = usb_gadget_initialize(usbctrl_index);
+ if (ret) {
+ pr_err("usb_gadget_initialize failed\n");
+ return CMD_RET_FAILURE;
+ }
g_dnl_clear_detach();
ret = g_dnl_register(usb_dnl_gadget);
if (ret) {
g_dnl_clear_detach();
ret = g_dnl_register(usb_dnl_gadget);
if (ret) {
-
erro
r("g_dnl_register failed");
+
pr_er
r("g_dnl_register failed");
return CMD_RET_FAILURE;
}
return CMD_RET_FAILURE;
}
@@
-71,7
+74,7
@@
int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)
ret = dfu_flush(dfu_get_defer_flush(), NULL, 0, 0);
dfu_set_defer_flush(NULL);
if (ret) {
ret = dfu_flush(dfu_get_defer_flush(), NULL, 0, 0);
dfu_set_defer_flush(NULL);
if (ret) {
-
erro
r("Deferred dfu_flush() failed!");
+
pr_er
r("Deferred dfu_flush() failed!");
goto exit;
}
}
goto exit;
}
}
@@
-81,10
+84,10
@@
int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)
}
exit:
g_dnl_unregister();
}
exit:
g_dnl_unregister();
-
board_usb_cleanup(usbctrl_index, USB_INIT_DEVICE
);
+
usb_gadget_release(usbctrl_index
);
if (dfu_reset)
if (dfu_reset)
-
run_command("reset", 0
);
+
do_reset(NULL, 0, 0, NULL
);
g_dnl_clear_detach();
g_dnl_clear_detach();