Merge branch 'master' of github.com:PX4/Firmware

1 files changed, 39 insertions, 3 deletions

diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig
index f6a5aa045..92bc83cfd 100644
--- a/apps/nshlib/Kconfig
+++ b/apps/nshlib/Kconfig
@@ -292,6 +292,19 @@ config NSH_ROMFSETC
 endif
 
 if NSH_ROMFSETC
+
+config NSH_ROMFSRC
+	bool "Support ROMFS login script"
+	default n
+	---help---
+		The ROMFS start-up script will be executed excactly once.  For
+		simple, persistence consoles (like a serial console).  But with
+		other other kinds of consoles, there may be multiple, transient
+		sessions (such as Telnet and USB consoles).  In these cases, you
+		may need another script that is executed at the beginning of each
+		session.  Selecting this option enables support for such a login
+		script
+
 config NSH_ROMFSMOUNTPT
 	string "ROMFS mount point"
 	default "/etc"
@@ -308,6 +321,15 @@ config NSH_INITSCRIPT
 		The default is init.d/rcS.  This is a relative path and must not
 		start with '/'.
 
+config NSH_RCSCRIPT
+	string "Relative path to login script"
+	default ".nshrc"
+	depends on NSH_ROMFSRC
+	---help---
+		This is the relative path to the login script within the mountpoint.
+		The default is .nshrc.  This is a relative path and must not
+		start with '/'.
+
 config NSH_ROMFSDEVNO
 	int "ROMFS block device minor number"
 	default 0
@@ -406,7 +428,7 @@ config NSH_USBCONDEV
 		readable/write-able USB driver such as:
 		NSH_USBCONDEV="/dev/ttyACM0".
 
-config UBSDEV_MINOR
+config USBDEV_MINOR
 	int "USB console device minor number"
 	default 0
 	depends on NSH_USBCONSOLE
@@ -414,8 +436,22 @@ config UBSDEV_MINOR
 		If there are more than one USB devices, then a USB device
 		minor number may also need to be provided. Default: 0
 
-menu "USB Trace Support"
+comment "USB Trace Support"
+config NSH_USBDEV_TRACE
+	bool "Enable Builtin USB Trace Support"
+	default n
 	depends on USBDEV && (DEBUG || USBDEV_TRACE)
+	---help---
+		Enable builtin USB trace support in NSH.  If selected, buffered USB
+		trace data will be presented each time a command is provided to NSH.
+		The USB trace data will be sent to the console unless DEBUG set or
+		unless you are using a USB console.  In those cases, the trace data
+		will go to the SYSLOG device.
+
+		If not enabled, the USB trace support can be provided by external
+		logic such as apps/system/usbmonitor.
+
+if NSH_USBDEV_TRACE
 
 config NSH_USBDEV_TRACEINIT
 	bool "Show initialization events"
@@ -447,7 +483,7 @@ config NSH_USBDEV_TRACEINTERRUPTS
 	---help---
 		Show interrupt-related events
 
-endmenu
+endif
 
 config NSH_CONDEV
 	bool "Default console device"