From 8172f4af8664288ad3c11df8744446abe29eebca Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Tue, 31 Jan 2017 10:44:05 +0530 Subject: [PATCH] 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 Signed-off-by: Michal Simek --- cmd/jffs2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/jffs2.c b/cmd/jffs2.c index f00d53a6c83..9be198eddce 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 ]" ); -- 2.47.3