[U-Boot] [PATCH] cmd: jffs2: Rename command ls to fsls

[U-Boot] [PATCH] cmd: jffs2: Rename command ls to fsls

[Michal Simek]

From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index f00d53a6c833..9be198eddce4 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 ]"
 );
-- 
1.9.1

[U-Boot] cmd: jffs2: Rename command ls to fsls

[Tom Rini]

On Tue, May 30, 2017 at 02:18:55PM +0200, Michal Simek wrote:

> From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
> 
> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170610/75171a9f/attachment.sig>