mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
98a8f445fd
When the `dfu` command is called from the U-Boot environment,
it now accepts an optional parameter that specifies a timeout (in seconds).
If a DFU connection is not made within that time the `dfu` command exits
(as it would if Ctrl+C was pressed). If the timeout is left empty or being
zero the `dfu` command behaves as it does now.
This is useful for allowing U-Boot to check to see if anything wants to
upload new firmware before continuing to boot.
The patch is based on the commit
5e966ccc3c
by Sebastien Colleur, which has been heavily reworked due to U-Boot changes
in the past.
Signed-off-by: Brad Campbell <bradjc5@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
106 lines
2.4 KiB
C
106 lines
2.4 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* cmd_dfu.c -- dfu command
|
|
*
|
|
* Copyright (C) 2015
|
|
* Lukasz Majewski <l.majewski@majess.pl>
|
|
*
|
|
* Copyright (C) 2012 Samsung Electronics
|
|
* authors: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
|
|
* Lukasz Majewski <l.majewski@samsung.com>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <watchdog.h>
|
|
#include <dfu.h>
|
|
#include <console.h>
|
|
#include <g_dnl.h>
|
|
#include <usb.h>
|
|
#include <net.h>
|
|
|
|
static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
|
|
if (argc < 2)
|
|
return CMD_RET_USAGE;
|
|
|
|
#ifdef CONFIG_DFU_OVER_USB
|
|
char *usb_controller = argv[1];
|
|
#endif
|
|
#if defined(CONFIG_DFU_OVER_USB) || defined(CONFIG_DFU_OVER_TFTP)
|
|
char *interface = NULL;
|
|
char *devstring = NULL;
|
|
#if defined(CONFIG_DFU_TIMEOUT) || defined(CONFIG_DFU_OVER_TFTP)
|
|
unsigned long value = 0;
|
|
#endif
|
|
|
|
if (argc >= 4) {
|
|
interface = argv[2];
|
|
devstring = argv[3];
|
|
}
|
|
|
|
#if defined(CONFIG_DFU_TIMEOUT) || defined(CONFIG_DFU_OVER_TFTP)
|
|
if (argc == 5 || argc == 3)
|
|
value = simple_strtoul(argv[argc - 1], NULL, 0);
|
|
#endif
|
|
#endif
|
|
|
|
int ret = 0;
|
|
#ifdef CONFIG_DFU_OVER_TFTP
|
|
if (!strcmp(argv[1], "tftp"))
|
|
return update_tftp(value, interface, devstring);
|
|
#endif
|
|
#ifdef CONFIG_DFU_OVER_USB
|
|
ret = dfu_init_env_entities(interface, devstring);
|
|
if (ret)
|
|
goto done;
|
|
|
|
#ifdef CONFIG_DFU_TIMEOUT
|
|
dfu_set_timeout(value * 1000);
|
|
#endif
|
|
|
|
ret = CMD_RET_SUCCESS;
|
|
if (strcmp(argv[argc - 1], "list") == 0) {
|
|
dfu_show_entities();
|
|
goto done;
|
|
}
|
|
|
|
int controller_index = simple_strtoul(usb_controller, NULL, 0);
|
|
|
|
run_usb_dnl_gadget(controller_index, "usb_dnl_dfu");
|
|
|
|
done:
|
|
dfu_free_entities();
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
U_BOOT_CMD(dfu, CONFIG_SYS_MAXARGS, 1, do_dfu,
|
|
"Device Firmware Upgrade",
|
|
""
|
|
#ifdef CONFIG_DFU_OVER_USB
|
|
#ifdef CONFIG_DFU_TIMEOUT
|
|
"<USB_controller> [<interface> <dev>] [<timeout>] [list]\n"
|
|
#else
|
|
"<USB_controller> [<interface> <dev>] [list]\n"
|
|
#endif
|
|
" - device firmware upgrade via <USB_controller>\n"
|
|
" on device <dev>, attached to interface\n"
|
|
" <interface>\n"
|
|
#ifdef CONFIG_DFU_TIMEOUT
|
|
" [<timeout>] - specify inactivity timeout in seconds\n"
|
|
#endif
|
|
" [list] - list available alt settings\n"
|
|
#endif
|
|
#ifdef CONFIG_DFU_OVER_TFTP
|
|
#ifdef CONFIG_DFU_OVER_USB
|
|
"dfu "
|
|
#endif
|
|
"tftp [<interface> <dev>] [<addr>]\n"
|
|
" - device firmware upgrade via TFTP\n"
|
|
" on device <dev>, attached to interface\n"
|
|
" <interface>\n"
|
|
" [<addr>] - address where FIT image has been stored\n"
|
|
#endif
|
|
);
|