dfu: Drop unused prototype of dfu_trigger_reset()
PATCH 1/4 dfu: Drop unused prototype of dfu_trigger_reset()
After the commit 1cc03c5c53c0 ("dfu: Provide means to find difference between dfu-util -e and -R") the dangling ptototype appeared. Remove it here.
--- include/dfu.h | 1 - 1 file changed, 1 deletion(-)
include/dfu.h +0 -1
@@ -171,7 +171,6 @@ const char *dfu_get_dev_type(enum dfu_device_type t);const char *dfu_get_layout (enum dfu_layout l);struct dfu_entity *dfu_get_entity (int alt);char *dfu_extract_token (char ** e,int *n); -void dfu_trigger_reset (void );int dfu_get_alt (char *name);int dfu_init_env_entities (char *interface,char *devstr);unsigned char *dfu_get_buf (struct dfu_entity *dfu);
Signature · 1 line
2.24.0
PATCH 2/4 dfu: Refactor do_dfu() to handle optional argument
In the future we may utilize optional argument in 'dfu' command line. As a preparation for this, refactor do_dfu().
--- cmd/dfu.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
cmd/dfu.c +10 -7
@@ -30,22 +30,25 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#if defined(CONFIG_DFU_OVER_USB ) || defined(CONFIG_DFU_OVER_TFTP )char *interface =NULL ;char *devstring =NULL ; +#if defined(CONFIG_DFU_OVER_TFTP ) +unsigned long value =0 ; +#endif if (argc >=4 ) { interface = argv[2 ]; devstring = argv[3 ]; } + +#if 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 -unsigned long addr =0 ; -if (!strcmp (argv[1 ],"tftp" )) { -if (argc ==5 || argc ==3 ) - addr =simple_strtoul (argv[argc -1 ],NULL ,0 ); - -return update_tftp (addr, interface, devstring); - } +if (!strcmp (argv[1 ],"tftp" )) +return update_tftp (value, interface, devstring);#endif #ifdef CONFIG_DFU_OVER_USB ret =dfu_init_env_entities (interface, devstring);
Signature · 1 line
2.24.0
PATCH 2/4 dfu: Refactor do_dfu() to handle optional argument
Quoted 38 lines · On Wed, 13 Nov 2019 19:43:42 +0200 Andy Shevchenko…
In the future we may utilize optional argument in 'dfu' command line. As a preparation for this, refactor
do_dfu().Signed-off-by Andy Shevchenko <[email protected]>--- cmd/dfu.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)cmd/dfu.c +0
-0@@ -30,22 +30,25 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, intargc, char * const argv[]) #if
defined(CONFIG_DFU_OVER_USB)||defined(CONFIG_DFU_OVER_TFTP)char *interface = NULL;cmd/dfu.c +8
-4char *devstring =NULL ; +#if defined(CONFIG_DFU_OVER_TFTP ) +unsigned long value =0 ; +#endif if (argc >=4 ) { interface = argv[2 ]; devstring = argv[3 ]; } + +#if 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 -unsigned long addr =0 ; -if (!strcmp (argv[1 ],"tftp" )) { -if (argc ==5 || argc ==3 ) - addr = simple_strtoul(argv[argc - 1], NULL,0); -
cmd/dfu.c static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 54
Quoted 7 lines
cmd/dfu.c +2
-2- return update_tftp(addr, interface, devstring); - } +if (!strcmp (argv[1 ],"tftp" )) +return update_tftp (value, interface, devstring);#endif #ifdef CONFIG_DFU_OVER_USB ret =dfu_init_env_entities (interface, devstring);
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191127/cda6d828/attachment.sig>
PATCH 3/4 dfu: Add optional timeout parameter
In reply to Andy ShevchenkoWhen 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
which has been heavily reworked due to U-Boot changes in the past.
--- cmd/dfu.c | 15 +++++++++++++-- common/dfu.c | 17 +++++++++++++++++ drivers/dfu/Kconfig | 6 ++++++ drivers/dfu/dfu.c | 15 +++++++++++++++ include/dfu.h | 5 +++++ 5 files changed, 56 insertions(+), 2 deletions(-)
cmd/dfu.c +13 -2
@@ -30,7 +30,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#if defined(CONFIG_DFU_OVER_USB ) || defined(CONFIG_DFU_OVER_TFTP )char *interface =NULL ;char *devstring =NULL ; -#if defined(CONFIG_DFU_OVER_TFTP ) +#if defined(CONFIG_DFU_TIMEOUT ) || defined(CONFIG_DFU_OVER_TFTP )unsigned long value =0 ;#endif
@@ -39,7 +39,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) devstring = argv[3 ]; } -#if defined(CONFIG_DFU_OVER_TFTP ) +#if defined(CONFIG_DFU_TIMEOUT ) || defined(CONFIG_DFU_OVER_TFTP )if (argc ==5 || argc ==3 ) value =simple_strtoul (argv[argc -1 ],NULL ,0 );#endif
@@ -55,6 +55,10 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])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 ();
@@ -75,10 +79,17 @@ 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
common/dfu.c +17 -0
@@ -35,6 +35,10 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)return CMD_RET_FAILURE ; } +#ifdef CONFIG_DFU_TIMEOUT +unsigned long start_time =get_timer (0 ); +#endif +while (1 ) {if (g_dnl_detach ()) {/*
@@ -79,6 +83,19 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget) } } +#ifdef CONFIG_DFU_TIMEOUT +unsigned long wait_time =dfu_get_timeout (); + +if (wait_time) { +unsigned long current_time =get_timer (start_time); + +if (current_time > wait_time) { +debug ("Inactivity timeout, abort DFU\n" ); + goto exit; + } + } +#endif +WATCHDOG_RESET ();usb_gadget_handle_interrupts (usbctrl_index); }
drivers/dfu/Kconfig +6 -0
@@ -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
drivers/dfu/dfu.c +15 -0
@@ -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 ;
include/dfu.h +5 -0
@@ -178,6 +178,11 @@ unsigned char *dfu_free_buf(void);unsigned long dfu_get_buf_size (void );bool dfu_usb_get_reset (void ); +#ifdef CONFIG_DFU_TIMEOUT +unsigned long dfu_get_timeout (void ); +void dfu_set_timeout (unsigned long ); +#endif +int dfu_read (struct dfu_entity *de,void *buf,int size,int blk_seq_num);int dfu_write (struct dfu_entity *de,void *buf,int size,int blk_seq_num);int dfu_flush (struct dfu_entity *de,void *buf,int size,int blk_seq_num);
Signature · 1 line
2.24.0
PATCH 3/4 dfu: Add optional timeout parameter
Hi Andy,
Thank you for your work on enhancing DFU. The patch series is generally Ok.
Please find some minor comments/requests below.
Quoted 144 lines
When the
dfucommand 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 thedfucommand exits (as it would if Ctrl+C was pressed). If the timeout is left empty or being zero thedfucommand 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
which has been heavily reworked due to U-Boot changes in the past.Signed-off-by Sebastien Colleur <[email protected]>Signed-off-by Brad Campbell <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- cmd/dfu.c | 15 +++++++++++++-- common/dfu.c | 17 +++++++++++++++++ drivers/dfu/Kconfig | 6 ++++++ drivers/dfu/dfu.c | 15 +++++++++++++++ include/dfu.h | 5 +++++ 5 files changed, 56 insertions(+), 2 deletions(-)cmd/dfu.c +0
-0@@ -30,7 +30,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, intargc, char * const argv[]) #if
defined(CONFIG_DFU_OVER_USB)||defined(CONFIG_DFU_OVER_TFTP)char *interface = NULL;cmd/dfu.c +13
-2char *devstring =NULL ; -#if defined(CONFIG_DFU_OVER_TFTP ) +#if defined(CONFIG_DFU_TIMEOUT ) || defined(CONFIG_DFU_OVER_TFTP )unsigned long value =0 ;#endif @@ -39,7 +39,7 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) devstring = argv[3]; } -#if defined(CONFIG_DFU_OVER_TFTP ) +#if defined(CONFIG_DFU_TIMEOUT ) || defined(CONFIG_DFU_OVER_TFTP )if (argc ==5 || argc ==3 ) value =simple_strtoul (argv[argc -1 ],NULL ,0 );#endif @@ -55,6 +55,10 @@ static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) 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 ();@@ -75,10 +79,17 @@ 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_TFTPcommon/dfu.c +9
-0@@ -35,6 +35,10 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget) return CMD_RET_FAILURE; } +#ifdef CONFIG_DFU_TIMEOUT +unsigned long start_time =get_timer (0 ); +#endif +while (1 ) {if (g_dnl_detach ()) {/* @@ -79,6 +83,19 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget) } } +#ifdef CONFIG_DFU_TIMEOUT +unsigned long wait_time =dfu_get_timeout (); + +if (wait_time) { + unsigned long current_time =
get_timer(start_time); +common/dfu.c +2
-0+if (current_time > wait_time) { + debug("Inactivity timeout, abortDFU\n");
common/dfu.c +5
-0+ goto exit; + } + } +#endif +WATCHDOG_RESET ();usb_gadget_handle_interrupts (usbctrl_index); }drivers/dfu/Kconfig +0
-0@@ -23,6 +23,12 @@ config DFU_TFTP Detailed description of this feature can be found at./doc/README.dfutftp
drivers/dfu/Kconfig +4
-0+config DFU_TIMEOUT + bool "Timeout waiting for DFU" + help + This option adds an optional timeout parameter for DFUwhich, if set,
drivers/dfu/Kconfig +1
-0+ will cause DFU to only wait for that many seconds beforeexiting. +
configDFU_MMCdrivers/dfu/Kconfig +0
-0bool "MMC back end for DFU" helpdrivers/dfu/dfu.c +3
-0@@ -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
drivers/dfu/dfu.c __weak bool dfu_usb_get_reset(void) · line 68
Quoted 8 lines
drivers/dfu/dfu.c +5
-0@@ -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; +}
I do guess that dfu_set_timeout() is not yet used in this patch series?
Quoted 24 lines
drivers/dfu/dfu.c +7
-0+ +unsigned long dfu_get_timeout (void ) +{ +return dfu_timeout; +} +#endif +static int dfu_find_alt_num (const char *s) {int i =0 ;include/dfu.h +5
-0@@ -178,6 +178,11 @@ unsigned char *dfu_free_buf(void);unsigned long dfu_get_buf_size (void );bool dfu_usb_get_reset (void ); +#ifdef CONFIG_DFU_TIMEOUT +unsigned long dfu_get_timeout (void ); +void dfu_set_timeout (unsigned long ); +#endif + int dfu_read(struct dfu_entity *de, void *buf, int size, int
Quoted 3 lines
blk_seq_num); intdfu_write(struct dfu_entity *de, void *buf, int size, int blk_seq_num); intdfu_flush(struct dfu_entity *de, void *buf, int size, int blk_seq_num);
Please add some description and example of this new option / feature to ./doc/README.dfu file.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191127/d508438b/attachment.sig>
PATCH 3/4 dfu: Add optional timeout parameter
Quoted 4 lines · Lukasz Majewski
Thank you for your work on enhancing DFU. The patch series is generally Ok.
Please find some minor comments/requests below.
Thank you for review, my answers below.
Quoted 3 lines
cmd/dfu.c static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 60
Quoted 3 lines
cmd/dfu.c +3
-0+#ifdef CONFIG_DFU_TIMEOUT +dfu_set_timeout (value *1000 ); +#endif
(1)
Quoted 7 lines
drivers/dfu/dfu.c __weak bool dfu_usb_get_reset(void) · line 68
Quoted 5 lines
drivers/dfu/dfu.c +5
-0+#ifdef CONFIG_DFU_TIMEOUT +void dfu_set_timeout (unsigned long timeout) +{ + dfu_timeout = timeout; +}I do guess that
dfu_set_timeout()is not yet used in this patch series?
I think you missed (1) by some reason.
Quoted 2 lines
Please add some description and example of this new option / feature to ./doc/README.dfu file.
Will do for v2.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 3/4 dfu: Add optional timeout parameter
Hi Andy,
Quoted 24 lines · Lukasz Majewski
Quoted 5 lines
Thank you for your work on enhancing DFU. The patch series is generally Ok.
Please find some minor comments/requests below.
Thank you for review, my answers below.
Quoted 3 lines
cmd/dfu.c static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 60
Quoted 3 lines
cmd/dfu.c +3
-0+#ifdef CONFIG_DFU_TIMEOUT +dfu_set_timeout (value *1000 ); +#endif (1)
Quoted 8 lines
drivers/dfu/dfu.c __weak bool dfu_usb_get_reset(void) · line 68
Quoted 5 lines
drivers/dfu/dfu.c +5
-0+#ifdef CONFIG_DFU_TIMEOUT +void dfu_set_timeout (unsigned long timeout) +{ + dfu_timeout = timeout; +}I do guess that
dfu_set_timeout()is not yet used in this patch series?
Quoted 1 line
I think you missed (1) by some reason.
Right. Thanks for pointing this out.
Quoted 6 lines
Quoted 3 lines
Please add some description and example of this new option / feature to ./doc/README.dfu file.
Will do for v2.
Thanks, appreciated.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191127/5f77468e/attachment.sig>
PATCH 4/4 x86: edison: Enable DFU timeout
In reply to Andy ShevchenkoThe stock U-Boot on Intel Edison has timeout parameter for DFU command. Enable it here to be compatible with the original U-Boot configuration.
--- configs/edison_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/edison_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DEFAULT_DEVICE_TREE="edison" CONFIG_ENV_IS_IN_MMC=y CONFIG_CPU=y +CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_SUPPORT_EMMC_BOOT=y
Signature · 1 line
2.24.0
PATCH 4/4 x86: edison: Enable DFU timeout
Hi Andy,
Quoted 14 lines
The stock U-Boot on Intel Edison has timeout parameter for DFU command. Enable it here to be compatible with the original U-Boot configuration.
Signed-off-by Andy Shevchenko <[email protected]>--- configs/edison_defconfig | 1 + 1 file changed, 1 insertion(+)configs/edison_defconfig +0
-0
configs/edison_defconfig CONFIG_CMD_FS_GENERIC=y · line 35
Quoted 7 lines
configs/edison_defconfig +1
-0@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DEFAULT_DEVICE_TREE="edison" CONFIG_ENV_IS_IN_MMC=y CONFIG_CPU=y +CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_SUPPORT_EMMC_BOOT=y
This patch doesn't apply now.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191127/51599972/attachment.sig>
PATCH 4/4 x86: edison: Enable DFU timeout
Quoted 11 lines · Lukasz Majewski
Hi Andy,
Quoted 9 lines
The stock U-Boot on Intel Edison has timeout parameter for DFU command. Enable it here to be compatible with the original U-Boot configuration.
Signed-off-by Andy Shevchenko <[email protected]>--- configs/edison_defconfig | 1 + 1 file changed, 1 insertion(+)
Quoted 14 lines
configs/edison_defconfig CONFIG_CMD_FS_GENERIC=y · line 35
Quoted 12 lines
configs/edison_defconfig +1
-0@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DEFAULT_DEVICE_TREE="edison" CONFIG_ENV_IS_IN_MMC=y CONFIG_CPU=y +CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_SUPPORT_EMMC_BOOT=yThis patch doesn't apply now.
I base my patches on official releases / release candidates. It applies very well on top of 2020.01-rc3 as of today. Does DFU has a separate repository / branch to track?
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 4/4 x86: edison: Enable DFU timeout
Quoted 27 lines · Andy Shevchenko
Quoted 11 lines · Lukasz Majewski
Hi Andy,
Quoted 9 lines
The stock U-Boot on Intel Edison has timeout parameter for DFU command. Enable it here to be compatible with the original U-Boot configuration.
Signed-off-by Andy Shevchenko <[email protected]>--- configs/edison_defconfig | 1 + 1 file changed, 1 insertion(+)Quoted 14 lines
configs/edison_defconfig CONFIG_CMD_FS_GENERIC=y · line 35
Quoted 12 lines
configs/edison_defconfig +1
-0@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DEFAULT_DEVICE_TREE="edison" CONFIG_ENV_IS_IN_MMC=y CONFIG_CPU=y +CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_SUPPORT_EMMC_BOOT=yThis patch doesn't apply now.
Quoted 3 lines
I base my patches on official releases / release candidates. It applies very well on top of 2020.01-rc3 as of today. Does DFU has a separate repository / branch to track?
I see few patches in mainstream touching areas nearby. Though, this one can be still applied with a reduced context.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 4/4 x86: edison: Enable DFU timeout
In reply to Andy ShevchenkoHi Andy,
Quoted 27 lines · Lukasz Majewski
Quoted 11 lines
Hi Andy,
Quoted 9 lines
The stock U-Boot on Intel Edison has timeout parameter for DFU command. Enable it here to be compatible with the original U-Boot configuration.
Signed-off-by Andy Shevchenko <[email protected]>--- configs/edison_defconfig | 1 + 1 file changed, 1 insertion(+)Quoted 14 lines
configs/edison_defconfig CONFIG_CMD_FS_GENERIC=y · line 35
Quoted 12 lines
configs/edison_defconfig +1
-0@@ -29,6 +29,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_DEFAULT_DEVICE_TREE="edison" CONFIG_ENV_IS_IN_MMC=y CONFIG_CPU=y +CONFIG_DFU_TIMEOUT=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_SUPPORT_EMMC_BOOT=yThis patch doesn't apply now.
Quoted 4 lines
I base my patches on official releases / release candidates. It applies very well on top of 2020.01-rc3 as of today. Does DFU has a separate repository / branch to track?
I'm using u-boot-usb as a base:
https://gitlab.denx.de/u-boot/custodians/u-boot-usb/commits/next
as I'm sending PRs to Marek.
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191127/3cebcabd/attachment.sig>
PATCH 4/4 x86: edison: Enable DFU timeout
Quoted 7 lines · Lukasz Majewski
Quoted 6 lines · Lukasz Majewski
I base my patches on official releases / release candidates. It applies very well on top of 2020.01-rc3 as of today. Does DFU has a separate repository / branch to track?
Quoted 5 lines
I'm using u-boot-usb as a base:
https://gitlab.denx.de/u-boot/custodians/u-boot-usb/commits/next
as I'm sending PRs to Marek.
I see, thanks. I have added it to my remote list.
Note, I sent v2 based on origin/master, but later I have tested against usb/next and everything can be applied well.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 4/4 x86: edison: Enable DFU timeout
Quoted 10 lines · On Wed, 27 Nov 2019 18:45:43 +0200 Andy Shevchenko…
Quoted 9 lines · Lukasz Majewski
Quoted 6 lines · Lukasz Majewski
I base my patches on official releases / release candidates. It applies very well on top of 2020.01-rc3 as of today. Does DFU has a separate repository / branch to track?
I'm using u-boot-usb as a base:
Quoted 9 lines
Quoted 3 lines
https://gitlab.denx.de/u-boot/custodians/u-boot-usb/commits/next
as I'm sending PRs to Marek.
I see, thanks. I have added it to my remote list.
Note, I sent v2 based on origin/master, but later I have tested against usb/next and everything can be applied well.
Ok. Great :-)
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191127/99ddd5cd/attachment.sig>
PATCH 1/4 dfu: Drop unused prototype of dfu_trigger_reset()
In reply to Andy ShevchenkoQuoted 17 lines · On Wed, 13 Nov 2019 19:43:41 +0200 Andy Shevchenko…
After the commit
1cc03c5c53c0("dfu: Provide means to find difference between dfu-util -e and -R") the dangling ptototype appeared. Remove it here.Fixes 1cc03c5c53c0 ("dfu: Provide means to find difference betweendfu-util -e and -R") Cc: Lukasz Majewski <[email protected]>
Cc Stephen Warren <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- include/dfu.h | 1 - 1 file changed, 1 deletion(-)include/dfu.h +0
-0
include/dfu.h const char *dfu_get_dev_type(enum dfu_device_type · line 176
Quoted 7 lines
include/dfu.h +0
-1@@ -171,7 +171,6 @@ const char *dfu_get_dev_type(enum dfu_device_type t); const char *dfu_get_layout(enum dfu_layout l);struct dfu_entity *dfu_get_entity (int alt);char *dfu_extract_token (char ** e,int *n); -void dfu_trigger_reset (void );int dfu_get_alt (char *name);int dfu_init_env_entities (char *interface,char *devstr);unsigned char *dfu_get_buf (struct dfu_entity *dfu);
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191127/6104eaaf/attachment.sig>