diff options
| author | Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> | 2017-05-30 12:18:55 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-09 15:24:01 (GMT) |
| commit | 314f6362c47c8e43b1fd216fcf1dbed355608b05 (patch) | |
| tree | 21da0384bd3eb4eecf0aa3b4b954fb0ae951ed38 /cmd | |
| parent | 2bd3cab33525e107be1dc67f5172dd5eadb18d52 (diff) | |
| download | u-boot-314f6362c47c8e43b1fd216fcf1dbed355608b05.tar.xz | |
cmd: jffs2: Rename command ls to fsls
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>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/jffs2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/jffs2.c b/cmd/jffs2.c index f00d53a..9be198e 100644 --- a/cmd/jffs2.c +++ b/cmd/jffs2.c @@ -606,7 +606,7 @@ U_BOOT_CMD( " with offset 'off'" ); U_BOOT_CMD( - ls, 2, 1, do_jffs2_ls, + fsls, 2, 1, do_jffs2_ls, "list files in a directory (default /)", "[ directory ]" ); |