diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-13 16:08:55 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-13 16:08:55 +0100 |
| commit | 7e016731de7a4b8977403149d65e620cefcbd2a0 (patch) | |
| tree | 5848fb2f8922609bb2a6eafd42395737fada4b76 /nuttx-configs | |
| parent | 80d44833c261d89d193038b84971c17ddd1f7569 (diff) | |
| parent | 07c041d335848b74df2867b5702c7a64a0b24c61 (diff) | |
| download | px4-firmware-7e016731de7a4b8977403149d65e620cefcbd2a0.tar.gz px4-firmware-7e016731de7a4b8977403149d65e620cefcbd2a0.tar.bz2 px4-firmware-7e016731de7a4b8977403149d65e620cefcbd2a0.zip | |
Merging master to nuttx_bringup
Diffstat (limited to 'nuttx-configs')
| -rw-r--r-- | nuttx-configs/aerocore/nsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 4 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/Make.defs | 2 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index abcc71423..615c8273b 100644 --- a/nuttx-configs/aerocore/nsh/defconfig +++ b/nuttx-configs/aerocore/nsh/defconfig @@ -861,7 +861,9 @@ CONFIG_NSH_CODECS_BUFSIZE=128 CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_STRERROR=y CONFIG_NSH_LINELEN=128 +CONFIG_NSH_CMDPARMS=y CONFIG_NSH_MAXARGUMENTS=12 +CONFIG_NSH_ARGCAT=y CONFIG_NSH_NESTDEPTH=8 # CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLEBG is not set diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index ea2636c2b..e8b1c468c 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -923,9 +923,9 @@ CONFIG_NSH_READLINE=y # CONFIG_NSH_CLE is not set CONFIG_NSH_LINELEN=128 # CONFIG_NSH_DISABLE_SEMICOLON is not set -# CONFIG_NSH_CMDPARMS is not set +CONFIG_NSH_CMDPARMS=y CONFIG_NSH_MAXARGUMENTS=12 -# CONFIG_NSH_ARGCAT is not set +CONFIG_NSH_ARGCAT=y CONFIG_NSH_NESTDEPTH=8 # CONFIG_NSH_DISABLEBG is not set CONFIG_NSH_BUILTIN_APPS=y diff --git a/nuttx-configs/px4fmu-v2/nsh/Make.defs b/nuttx-configs/px4fmu-v2/nsh/Make.defs index 1c9c9a5ee..ecb77c1f2 100644 --- a/nuttx-configs/px4fmu-v2/nsh/Make.defs +++ b/nuttx-configs/px4fmu-v2/nsh/Make.defs @@ -149,7 +149,7 @@ ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 EXTRA_LIBS += --warn-common \ --gc-sections -CFLAGS = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common +CFLAGS = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS) CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS) diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 8e75c52a1..c85af86f2 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -1109,9 +1109,9 @@ CONFIG_NSH_READLINE=y # CONFIG_NSH_CLE is not set CONFIG_NSH_LINELEN=128 # CONFIG_NSH_DISABLE_SEMICOLON is not set -# CONFIG_NSH_CMDPARMS is not set +CONFIG_NSH_CMDPARMS=y CONFIG_NSH_MAXARGUMENTS=12 -# CONFIG_NSH_ARGCAT is not set +CONFIG_NSH_ARGCAT=y CONFIG_NSH_NESTDEPTH=8 # CONFIG_NSH_DISABLEBG is not set CONFIG_NSH_BUILTIN_APPS=y |