diff --git a/nshlib/nsh_consolemain.c b/nshlib/nsh_consolemain.c index 60e1f6e18..61aabf3ae 100644 --- a/nshlib/nsh_consolemain.c +++ b/nshlib/nsh_consolemain.c @@ -86,6 +86,12 @@ int nsh_consolemain(int argc, char *argv[]) DEBUGASSERT(pstate != NULL); +#ifdef CONFIG_NSH_USBDEV_TRACE + /* Initialize any USB tracing options that were requested */ + + usbtrace_enable(TRACE_BITSET); +#endif + #ifdef CONFIG_NSH_ROMFSETC /* Execute the start-up script */ @@ -104,12 +110,6 @@ int nsh_consolemain(int argc, char *argv[]) netinit_bringup(); #endif -#ifdef CONFIG_NSH_USBDEV_TRACE - /* Initialize any USB tracing options that were requested */ - - usbtrace_enable(TRACE_BITSET); -#endif - #if defined(CONFIG_NSH_ARCHINIT) && defined(CONFIG_BOARDCTL_FINALINIT) /* Perform architecture-specific final-initialization (if configured) */ diff --git a/nshlib/nsh_telnetd.c b/nshlib/nsh_telnetd.c index bfea5b6b2..a1685492a 100644 --- a/nshlib/nsh_telnetd.c +++ b/nshlib/nsh_telnetd.c @@ -127,15 +127,6 @@ static int nsh_telnetmain(int argc, char *argv[]) fflush(pstate->cn_outstream); - /* Execute the startup script. If standard console is also defined, then - * we will not bother with the initscript here (although it is safe to - * call nshinitscript multiple times). - */ - -#if defined(CONFIG_NSH_ROMFSETC) && !defined(CONFIG_NSH_CONSOLE) - nsh_initscript(vtbl); -#endif - /* Execute the login script */ #ifdef CONFIG_NSH_ROMFSRC @@ -266,6 +257,15 @@ int nsh_telnetstart(sa_family_t family) usbtrace_enable(TRACE_BITSET); #endif + /* Execute the startup script. If standard console is also defined, then + * we will not bother with the initscript here (although it is safe to + * call nshinitscript multiple times). + */ + +#if defined(CONFIG_NSH_ROMFSETC) && !defined(CONFIG_NSH_CONSOLE) + nsh_initscript(vtbl); +#endif + /* Configure the telnet daemon */ config.d_port = HTONS(CONFIG_NSH_TELNETD_PORT);