From 314f6362c47c8e43b1fd216fcf1dbed355608b05 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com> Date: Tue, 30 May 2017 14:18:55 +0200 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 <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 f00d53a6c8..9be198eddc 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.39.5