From: Lukasz Majewski <l.majewski@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2] dfu: thor: fix: Modify dfu_get_alt() function to support absolute paths
Date: Fri, 14 Nov 2014 11:39:48 +0100 [thread overview]
Message-ID: <20141114113948.195460df@amdc2363> (raw)
In-Reply-To: <1415181256-30569-1-git-send-email-l.majewski@samsung.com>
Hi Lukasz,
> Recently the ext4 file system imposed passing absolute path with its
> file name parameter.
> As a result dfu_alt_info env variable has been modified to provide
> absolute path when ext4 file system is accessed (e.g. /uImage ext4 0
> 2;).
>
> Unfortunately, lthor flashing program provides plain file name (like
> uImage) and hence those two file names do not match anymore.
>
> Presented commit also allows lthor to write files to sub directories
> (like /boot/bin/uImage).
>
> Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
> Reviewed-by: Marek Vasut <marex@denx.de>
> ---
> Changes for v2:
> - Fix patch to path in comment
> ---
> drivers/dfu/dfu.c | 29 +++++++++++++++++++++++++++--
> 1 file changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
> index 55e6a83..deafda2 100644
> --- a/drivers/dfu/dfu.c
> +++ b/drivers/dfu/dfu.c
> @@ -544,10 +544,35 @@ struct dfu_entity *dfu_get_entity(int alt)
> int dfu_get_alt(char *name)
> {
> struct dfu_entity *dfu;
> + char *str;
>
> list_for_each_entry(dfu, &dfu_list, list) {
> - if (!strncmp(dfu->name, name, strlen(dfu->name)))
> - return dfu->alt;
> + if (dfu->name[0] != '/') {
> + if (!strncmp(dfu->name, name,
> strlen(dfu->name)))
> + return dfu->alt;
> + } else {
> + /*
> + * One must also consider absolute path
> + * (/boot/bin/uImage) available at dfu->name
> when
> + * compared "plain" file name (uImage)
> + *
> + * It is the case for e.g. thor gadget where
> lthor SW
> + * sends only the file name, so only the
> very last part
> + * of path must be checked for equality
> + */
> +
> + str = strstr(dfu->name, name);
> + if (!str)
> + continue;
> +
> + /*
> + * Check if matching substring is the last
> element of
> + * dfu->name (uImage)
> + */
> + if (strlen(dfu->name) ==
> + ((str - dfu->name) + strlen(name)))
> + return dfu->alt;
> + }
> }
>
> return -ENODEV;
Applied to u-boot-dfu repository. Thanks
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
next prev parent reply other threads:[~2014-11-14 10:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-04 16:25 [U-Boot] [PATCH] dfu: thor: fix: Modify dfu_get_alt() function to support absolute paths Lukasz Majewski
2014-11-04 17:23 ` Marek Vasut
2014-11-05 9:54 ` [U-Boot] [PATCH v2] " Lukasz Majewski
2014-11-14 10:39 ` Lukasz Majewski [this message]
2014-11-14 11:58 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141114113948.195460df@amdc2363 \
--to=l.majewski@samsung.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox