diff options
author | Andy Shevchenko | 2019-11-27 18:12:15 +0200 |
---|---|---|
committer | Marek Vasut | 2020-01-07 14:37:50 +0100 |
commit | 98a8f445fd6b93988340d845c96fd47ff454e895 (patch) | |
tree | e1452a58cfedbce315b95651ce9908c721b904ba /drivers/dfu | |
parent | 2b1f8c2bdfe5f874233df221f037e1494bb8f875 (diff) |
dfu: Add optional timeout parameter
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
https://github.com/01org/edison-u-boot/commit/5e966ccc3c65c18c9783741fa04e0c45e021780c
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>
Diffstat (limited to 'drivers/dfu')
-rw-r--r-- | drivers/dfu/Kconfig | 6 | ||||
-rw-r--r-- | drivers/dfu/dfu.c | 15 |
2 files changed, 21 insertions, 0 deletions
diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig index 75fe0a12c61..9709b6277d6 100644 --- a/drivers/dfu/Kconfig +++ b/drivers/dfu/Kconfig @@ -23,6 +23,12 @@ config DFU_TFTP Detailed description of this feature can be found at ./doc/README.dfutftp +config DFU_TIMEOUT + bool "Timeout waiting for DFU" + help + This option adds an optional timeout parameter for DFU which, if set, + will cause DFU to only wait for that many seconds before exiting. + config DFU_MMC bool "MMC back end for DFU" help diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 38aecd3a058..df50196dfda 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -21,6 +21,9 @@ static LIST_HEAD(dfu_list); static int dfu_alt_num; static int alt_num_cnt; static struct hash_algo *dfu_hash_algo; +#ifdef CONFIG_DFU_TIMEOUT +static unsigned long dfu_timeout = 0; +#endif /* * The purpose of the dfu_flush_callback() function is to @@ -58,6 +61,18 @@ __weak bool dfu_usb_get_reset(void) #endif } +#ifdef CONFIG_DFU_TIMEOUT +void dfu_set_timeout(unsigned long timeout) +{ + dfu_timeout = timeout; +} + +unsigned long dfu_get_timeout(void) +{ + return dfu_timeout; +} +#endif + static int dfu_find_alt_num(const char *s) { int i = 0; |