dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

cmd: jffs2: Rename command ls to fsls

Browse Source 
Rename command ls to fsls as its conflicting with
generic file systesm command ls and this is causing
compilation failure as below, if both are enabled
and this patch fixes it.

cmd/jffs2.o:(.u_boot_list_2_cmd_2_ls+0x0):
multiple definition of `_u_boot_list_2_cmd_2_ls'
cmd/fs.o:(.u_boot_list_2_cmd_2_ls+0x0):first defined here
scripts/Makefile.build:359: recipe for target 'cmd/built-in.o'
failed
make[1]: *** [cmd/built-in.o] Error 1

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Siva Durga Prasad Paladugu
2017-05-30 14:18:55 +02:00
committed by Tom Rini
parent 2bd3cab335
commit 314f6362c4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/jffs2.c
View File

@@ -606,7 +606,7 @@ U_BOOT_CMD(
" with offset 'off'" " with offset 'off'"
); );
U_BOOT_CMD( U_BOOT_CMD(
ls, 2, 1, do_jffs2_ls, fsls, 2, 1, do_jffs2_ls,
"list files in a directory (default /)", "list files in a directory (default /)",
"[ directory ]" "[ directory ]"
); );