summaryrefslogtreecommitdiffstats
path: root/drivers/dfu
diff options
context:
space:
mode:
authorLukasz Majewski <l.majewski@samsung.com>2014-11-05 10:54:16 +0100
committerMarek Vasut <marex@denx.de>2014-11-14 21:09:06 +0100
commit5610b05789fb6f6af7e13ac8e7cac99e0b2422c7 (patch)
treef7483c95d7db363a0e316236d74edceeb68a1234 /drivers/dfu
parenta511a3e0e8dd48f4293096fbfb9dd7d57e89b0b4 (diff)
downloadblackbird-obmc-uboot-5610b05789fb6f6af7e13ac8e7cac99e0b2422c7.tar.gz
blackbird-obmc-uboot-5610b05789fb6f6af7e13ac8e7cac99e0b2422c7.zip
dfu: thor: fix: Modify dfu_get_alt() function to support absolute paths
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>
Diffstat (limited to 'drivers/dfu')
-rw-r--r--drivers/dfu/dfu.c29
1 files changed, 27 insertions, 2 deletions
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 55e6a83b9a..deafda29c9 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;
OpenPOWER on IntegriCloud