dfu:usb: Support for ext4
PATCH 1/2 dfu:usb: Support for ext4
Support for ext4 file system handling at DFU.
Signed-off-by Lukasz Majewski <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
--- drivers/dfu/dfu_mmc.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-)
drivers/dfu/dfu_mmc.c +26 -6
@@ -63,10 +63,23 @@ static int mmc_file_op(enum dfu_mmc_op op, struct dfu_entity *dfu,char *str_env;int ret; -sprintf (cmd_buf,"fat%s mmc %d:%d 0x%x %s %lx" , - op ==DFU_OP_READ ?"load" :"write" , - dfu->data.mmc.dev, dfu->data.mmc.part, - (unsigned int ) buf, dfu->name, *len); +switch (dfu->layout) { +case DFU_FS_FAT : +sprintf (cmd_buf,"fat%s mmc %d:%d 0x%x %s %lx" , + op ==DFU_OP_READ ?"load" :"write" , + dfu->data.mmc.dev, dfu->data.mmc.part, + (unsigned int ) buf, dfu->name, *len); +break ; +case DFU_FS_EXT4 : +sprintf (cmd_buf,"ext4%s mmc %d:%d /%s 0x%x %ld" , + op ==DFU_OP_READ ?"load" :"write" , + dfu->data.mmc.dev, dfu->data.mmc.part, + dfu->name, (unsigned int ) buf, *len); +break ; +default : +printf ("%s: Layout (%s) not (yet) supported!\n" , __func__, +dfu_get_layout (dfu->layout)); + }debug ("%s: %s 0x%p\n" , __func__, cmd_buf, cmd_buf);
@@ -107,6 +120,7 @@ int dfu_write_medium_mmc(struct dfu_entity *dfu, void *buf, long *len) ret =mmc_block_write (dfu, buf, len);break ;case DFU_FS_FAT : +case DFU_FS_EXT4 : ret =mmc_file_write (dfu, buf, len);break ;default :
@@ -126,6 +140,7 @@ int dfu_read_medium_mmc(struct dfu_entity *dfu, void *buf, long *len) ret =mmc_block_read (dfu, buf, len);break ;case DFU_FS_FAT : +case DFU_FS_EXT4 : ret =mmc_file_read (dfu, buf, len);break ;default :
@@ -149,12 +164,17 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s) dfu->data.mmc.lba_blk_size =get_mmc_blk_size (dfu->dev_num); }else if (!strcmp (st,"fat" )) { dfu->layout =DFU_FS_FAT ; - dfu->data.mmc.dev =simple_strtoul (s, &s,10 ); - dfu->data.mmc.part =simple_strtoul (++s, &s,10 ); + }else if (!strcmp (st,"ext4" )) { + dfu->layout =DFU_FS_EXT4 ; }else {printf ("%s: Memory layout (%s) not supported!\n" , __func__, st); } +if (dfu->layout ==DFU_FS_EXT4 || dfu->layout ==DFU_FS_FAT ) { + dfu->data.mmc.dev =simple_strtoul (s, &s,10 ); + dfu->data.mmc.part =simple_strtoul (++s, &s,10 ); + } + dfu->read_medium = dfu_read_medium_mmc; dfu->write_medium = dfu_write_medium_mmc;
Signature · 1 line
1.7.2.3
PATCH 2/2 dfu:usb:fix: Read the "filesize" environment variable only when file read
The "filesize" environment variable shall be read only when relevant file is read.
Signed-off-by Lukasz Majewski <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
--- drivers/dfu/dfu_mmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/dfu/dfu_mmc.c +1 -1
@@ -89,7 +89,7 @@ static int mmc_file_op(enum dfu_mmc_op op, struct dfu_entity *dfu,return ret; } -if (dfu->layout !=DFU_RAW_ADDR ) { +if (dfu->layout !=DFU_RAW_ADDR && op ==DFU_OP_READ ) { str_env =getenv ("filesize" );if (str_env ==NULL ) {puts ("dfu: Wrong file size!\n" );
Signature · 1 line
1.7.2.3
PATCH 2/2 dfu:usb:fix: Read the "filesize" environment variable only when file read
Dear Lukasz Majewski,
Quoted 5 lines
The "filesize" environment variable shall be read only when relevant file is read.
Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>
Reviewed-by Marek Vasut <[email protected]>
Quoted 9 lines
--- drivers/dfu/dfu_mmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/dfu/dfu_mmc.c +0
-0
drivers/dfu/dfu_mmc.c static int mmc_file_op(enum dfu_mmc_op op, struct · line 95
Quoted 8 lines
drivers/dfu/dfu_mmc.c +1
-1@@ -89,7 +89,7 @@ static int mmc_file_op(enum dfu_mmc_op op, struct dfu_entity *dfu, return ret; } -if (dfu->layout !=DFU_RAW_ADDR ) { +if (dfu->layout !=DFU_RAW_ADDR && op ==DFU_OP_READ ) { str_env =getenv ("filesize" );if (str_env ==NULL ) {puts ("dfu: Wrong file size!\n" );
Best regards,
Marek Vasut
PATCH 1/2 dfu:usb: Support for ext4
In reply to Lukasz MajewskiDear Lukasz Majewski,
Quoted 4 lines
Support for ext4 file system handling at DFU.
Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>
Reviewed-by Marek Vasut <[email protected]>
[...]
Best regards,
Marek Vasut