Merge branch 'master' of https://github.com/RT-Thread/rt-thread

components/finsh/msh_cmd.c

@@ -136,6 +136,7 @@ int cmd_rm(int argc, char** argv)
 }
 FINSH_FUNCTION_EXPORT_ALIAS(cmd_rm, __cmd_rm, "Remove (unlink) the FILE(s).");
 
+#ifdef DFS_USING_WORKDIR
 int cmd_cd(int argc, char** argv)
 {
     if (argc == 1)
@@ -157,6 +158,7 @@ int cmd_pwd(int argc, char** argv)
 	return 0;
 }
 FINSH_FUNCTION_EXPORT_ALIAS(cmd_pwd, __cmd_pwd, Print the name of the current working directory.);
+#endif
 
 int cmd_mkdir(int argc, char** argv)
 {

components/finsh/shell.c

@@ -131,6 +131,7 @@ void finsh_set_device(const char* device_name)
 		{
 			/* close old finsh device */
 			rt_device_close(shell->device);
+            rt_device_set_rx_indicate(dev, RT_NULL);
 		}
 
 		shell->device = dev;