cmd: jffs2: Rename command ls to fsls
authorSiva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Tue, 30 May 2017 12:18:55 +0000 (14:18 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 9 Jun 2017 15:24:01 +0000 (11:24 -0400)
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>
cmd/jffs2.c

index f00d53a6c8331f80e18633f882e8722369bef10d..9be198eddce44b638f76477308860bbabf012ec4 100644 (file)
@@ -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 ]"
 );