cmd: cp: add missing map_sysmem
PATCH 1/1 cmd: cp: add missing map_sysmem
The command cp fails on sandbox because the address is used directly. To fix this issue, we call the function map_sysmem to translate the address.
Signed-off-by Philippe Reynes <[email protected]>
--- cmd/mem.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
cmd/mem.c +13 -3
@@ -303,6 +303,7 @@ static int do_mem_cmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])static int do_mem_cp (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {ulong addr, dest, count; +void *src, *dst;int size;if (argc !=4 )
@@ -326,25 +327,34 @@ static int do_mem_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return 1 ; } + src =map_sysmem (addr, count * size); + dst =map_sysmem (dest, count * size); +#ifdef CONFIG_MTD_NOR_FLASH /* check if we are copying to Flash */ -if (addr2info (dest) !=NULL ) { +if (addr2info ((ulong )dst)) {int rc;puts ("Copy to Flash... " ); - rc =flash_write ((char *)addr, dest, count*size); + rc =flash_write ((char *)src, (ulong )dst, count * size);if (rc !=0 ) {flash_perror (rc); +unmap_sysmem (src); +unmap_sysmem (dst);return (1 ); }puts ("done\n" ); +unmap_sysmem (src); +unmap_sysmem (dst);return 0 ; }#endif -memcpy ((void *)dest, (void *)addr, count * size); +memcpy (dst, src, count * size); +unmap_sysmem (src); +unmap_sysmem (dst);return 0 ; }
Signature · 1 line
2.7.4
PATCH 1/1 cmd: cp: add missing map_sysmem
Quoted 5 lines · Philippe Reynes
The command cp fails on sandbox because the address is used directly. To fix this issue, we call the function
map_sysmemto translate the address.Signed-off-by Philippe Reynes <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191205/bd6bfa76/attachment.sig>