[U-Boot] [PATCH] thor: defer parsing of device string to IO backend
This commit adjust thor downloading function to work correctly with deferred device string parsing.
Signed-off-by: Lukasz Majewski l.majewski@samsung.com --- common/cmd_thordown.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index 2dd7509..8ed1dc6 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -26,10 +26,9 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
puts("TIZEN "THOR" Downloader\n");
- ret = dfu_init_env_entities(interface, simple_strtoul(devstring, - NULL, 10)); + ret = dfu_init_env_entities(interface, devstring); if (ret) - return ret; + goto done;
int controller_index = simple_strtoul(usb_controller, NULL, 0); ret = board_usb_init(controller_index, USB_INIT_DEVICE); @@ -57,6 +56,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
exit: g_dnl_unregister(); +done: dfu_free_entities();
return ret;
On 06/20/2014 01:35 AM, Lukasz Majewski wrote:
This commit adjust thor downloading function to work correctly with deferred device string parsing.
Oops. I should have grep'd for more users of dfu_init_env_entities() and fixed them up in my commit.
========== Since this patch also changes behaviour when that function fails, so the partially parsed entries are freed too, I'd re-write the whole commit description as:
Comit XXXXX "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit XXXXX "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes: XXXXX ("dfu: defer parsing of device string to IO backend") Signed-off-by: Lukasz Majewski l.majewski@samsung.com ==========
But either way, Reviewed-by: Stephen Warren swarren@nvidia.com
Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes: d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")
Signed-off-by: Lukasz Majewski l.majewski@samsung.com --- common/cmd_thordown.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index 96f7d32..27927ba 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -26,10 +26,9 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
puts("TIZEN "THOR" Downloader\n");
- ret = dfu_init_env_entities(interface, simple_strtoul(devstring, - NULL, 10)); + ret = dfu_init_env_entities(interface, devstring); if (ret) - return ret; + goto done;
int controller_index = simple_strtoul(usb_controller, NULL, 0); ret = board_usb_init(controller_index, USB_INIT_DEVICE); @@ -57,6 +56,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
exit: g_dnl_unregister(); +done: dfu_free_entities();
return ret;
Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes: d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")
Signed-off-by: Lukasz Majewski l.majewski@samsung.com --- common/cmd_thordown.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index 96f7d32..27927ba 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -26,10 +26,9 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
puts("TIZEN "THOR" Downloader\n");
- ret = dfu_init_env_entities(interface, simple_strtoul(devstring, - NULL, 10)); + ret = dfu_init_env_entities(interface, devstring); if (ret) - return ret; + goto done;
int controller_index = simple_strtoul(usb_controller, NULL, 0); ret = board_usb_init(controller_index, USB_INIT_DEVICE); @@ -57,6 +56,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
exit: g_dnl_unregister(); +done: dfu_free_entities();
return ret;
On Monday, June 23, 2014 at 09:39:16 AM, Lukasz Majewski wrote:
Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes: d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")
Signed-off-by: Lukasz Majewski l.majewski@samsung.com
Did this go out twice ? What's the V2 changelog please ?
Best regards, Marek Vasut
Hi Marek,
On Monday, June 23, 2014 at 09:39:16 AM, Lukasz Majewski wrote:
Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes: d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")
Signed-off-by: Lukasz Majewski l.majewski@samsung.com
Did this go out twice ?
I hope it didn't :-)
What's the V2 changelog please ?
My bad - I wanted to send it ASAP :-)
The v2 was just a complete rewrite of the v1's commit message as it was suggested by Stephen.
No code change was done.
Best regards, Marek Vasut
On 06/23/2014 01:39 AM, Lukasz Majewski wrote:
Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes: d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")
Signed-off-by: Lukasz Majewski l.majewski@samsung.com
Both the fixes and s-o-b tag should be in the same final paragraph with no blank lines between. I assume that can be easily fixed up when applying.
Reviewed-by: Stephen Warren swarren@nvidia.com
Hi Stephen,
On 06/23/2014 01:39 AM, Lukasz Majewski wrote:
Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes: d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")
Signed-off-by: Lukasz Majewski l.majewski@samsung.com
Both the fixes and s-o-b tag should be in the same final paragraph with no blank lines between. I assume that can be easily fixed up when applying.
Reviewed-by: Stephen Warren swarren@nvidia.com
Applied to u-boot-dfu,
participants (3)
-
Lukasz Majewski -
Marek Vasut -
Stephen Warren