diff mbox

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

Message ID 63eed0da00102d1c9d94666c026663955f65f40a.1496146733.git.michal.simek@xilinx.com
State Accepted
Commit 314f6362c47c8e43b1fd216fcf1dbed355608b05
Delegated to: Tom Rini
Headers show

Commit Message

Michal Simek May 30, 2017, 12:18 p.m. UTC 
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(-)

Comments

Tom Rini June 10, 2017, 1:46 p.m. UTC | #1 
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!
diff mbox

Patch

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 ]"
 );