mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-26 09:38:14 +00:00
1cc03c5c53
This commit provides distinction between DFU device detach and reset. The -R behavior is preserved with proper handling of the dfu-util's -e switch, which detach the DFU device. By running dfu-util -e; one can force device to finish the execution of dfu command on target and execute some other scripted commands. Moreover, some naming has been changed - the dfu_reset() method now is known as dfu_detach(). New name better reflects the purpose of the code. It was also necessary to increase the number of usb_gadget_handle_interrupts() calls since we also must wait for detection of the USB reset event. Example usage: 1. -e (detach) switch dfu-util -a0 -D file1.bin;dfu-util -a3 -D uImage;dfu-util -e access to u-boot prompt. 2. -R (reset) switch dfu-util -a0 -D file1.bin;dfu-util -R -a3 -D uImage target board reset Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Reviewed-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com>
90 lines
1.8 KiB
C
90 lines
1.8 KiB
C
/*
|
|
* cmd_dfu.c -- dfu command
|
|
*
|
|
* 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 <dfu.h>
|
|
#include <g_dnl.h>
|
|
#include <usb.h>
|
|
|
|
static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
bool dfu_reset = false;
|
|
|
|
if (argc < 4)
|
|
return CMD_RET_USAGE;
|
|
|
|
char *usb_controller = argv[1];
|
|
char *interface = argv[2];
|
|
char *devstring = argv[3];
|
|
|
|
int ret, i = 0;
|
|
|
|
ret = dfu_init_env_entities(interface, devstring);
|
|
if (ret)
|
|
goto done;
|
|
|
|
ret = CMD_RET_SUCCESS;
|
|
if (argc > 4 && strcmp(argv[4], "list") == 0) {
|
|
dfu_show_entities();
|
|
goto done;
|
|
}
|
|
|
|
int controller_index = simple_strtoul(usb_controller, NULL, 0);
|
|
board_usb_init(controller_index, USB_INIT_DEVICE);
|
|
dfu_clear_detach();
|
|
g_dnl_register("usb_dnl_dfu");
|
|
while (1) {
|
|
if (dfu_detach()) {
|
|
/*
|
|
* Check if USB bus reset is performed after detach,
|
|
* which indicates that -R switch has been passed to
|
|
* dfu-util. In this case reboot the device
|
|
*/
|
|
if (dfu_usb_get_reset()) {
|
|
dfu_reset = true;
|
|
goto exit;
|
|
}
|
|
|
|
/*
|
|
* This extra number of usb_gadget_handle_interrupts()
|
|
* calls is necessary to assure correct transmission
|
|
* completion with dfu-util
|
|
*/
|
|
if (++i == 10000)
|
|
goto exit;
|
|
}
|
|
|
|
if (ctrlc())
|
|
goto exit;
|
|
|
|
usb_gadget_handle_interrupts();
|
|
}
|
|
exit:
|
|
g_dnl_unregister();
|
|
done:
|
|
dfu_free_entities();
|
|
|
|
if (dfu_reset)
|
|
run_command("reset", 0);
|
|
|
|
dfu_clear_detach();
|
|
|
|
return ret;
|
|
}
|
|
|
|
U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
|
|
"Device Firmware Upgrade",
|
|
"<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"
|
|
);
|