On Tue, May 30, 2017 at 02:18:55PM +0200, Michal Simek wrote: > From: Siva Durga Prasad Paladugu <siva.durga.palad...@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 <siva...@xilinx.com> > Signed-off-by: Michal Simek <michal.si...@xilinx.com>
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
