diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-29 08:00:12 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-29 08:00:12 +0100 |
| commit | f4e0dc2857da7a8b42b7439ae57310b23c902cd9 (patch) | |
| tree | d31b6697458c5f54672ea6b5bbc3a267e6fa1be5 /nuttx-configs | |
| parent | acb4844939f971a1a33515316f5e6c7c8f668f12 (diff) | |
| parent | 22f744f0e17f83a706998381d1977c9cb24d457a (diff) | |
| download | px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.gz px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.bz2 px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
.gitmodules
Diffstat (limited to 'nuttx-configs')
| -rw-r--r-- | nuttx-configs/aerocore/nsh/Make.defs | 1 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/Make.defs | 1 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/Make.defs | 1 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx-configs/px4io-v1/nsh/Make.defs | 1 | ||||
| -rw-r--r-- | nuttx-configs/px4io-v2/nsh/Make.defs | 1 |
7 files changed, 7 insertions, 2 deletions
diff --git a/nuttx-configs/aerocore/nsh/Make.defs b/nuttx-configs/aerocore/nsh/Make.defs index c7a1b71bb..c1f5a8ac4 100644 --- a/nuttx-configs/aerocore/nsh/Make.defs +++ b/nuttx-configs/aerocore/nsh/Make.defs @@ -119,6 +119,7 @@ endif ARCHCFLAGS = -std=gnu99 ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=gnu++0x ARCHWARNINGS = -Wall \ + -Wno-sign-compare \ -Wextra \ -Wdouble-promotion \ -Wshadow \ diff --git a/nuttx-configs/px4fmu-v1/nsh/Make.defs b/nuttx-configs/px4fmu-v1/nsh/Make.defs index f055cfddf..5e28f2473 100644 --- a/nuttx-configs/px4fmu-v1/nsh/Make.defs +++ b/nuttx-configs/px4fmu-v1/nsh/Make.defs @@ -119,6 +119,7 @@ endif ARCHCFLAGS = -std=gnu99 ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=gnu++0x ARCHWARNINGS = -Wall \ + -Wno-sign-compare \ -Wextra \ -Wdouble-promotion \ -Wshadow \ diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index edf49b26e..fade1f0c6 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -404,7 +404,7 @@ CONFIG_SIG_SIGWORK=4 CONFIG_MAX_TASKS=32 CONFIG_MAX_TASK_ARGS=10 CONFIG_NPTHREAD_KEYS=4 -CONFIG_NFILE_DESCRIPTORS=38 +CONFIG_NFILE_DESCRIPTORS=42 CONFIG_NFILE_STREAMS=8 CONFIG_NAME_MAX=32 CONFIG_PREALLOC_MQ_MSGS=4 diff --git a/nuttx-configs/px4fmu-v2/nsh/Make.defs b/nuttx-configs/px4fmu-v2/nsh/Make.defs index b3cf28b7a..e0e868870 100644 --- a/nuttx-configs/px4fmu-v2/nsh/Make.defs +++ b/nuttx-configs/px4fmu-v2/nsh/Make.defs @@ -119,6 +119,7 @@ endif ARCHCFLAGS = -std=gnu99 ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=c++11 ARCHWARNINGS = -Wall \ + -Wno-sign-compare \ -Wextra \ -Wdouble-promotion \ -Wshadow \ diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index e31f40cd2..90dde6294 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -438,7 +438,7 @@ CONFIG_SIG_SIGWORK=4 CONFIG_MAX_TASKS=32 CONFIG_MAX_TASK_ARGS=10 CONFIG_NPTHREAD_KEYS=4 -CONFIG_NFILE_DESCRIPTORS=38 +CONFIG_NFILE_DESCRIPTORS=42 CONFIG_NFILE_STREAMS=8 CONFIG_NAME_MAX=32 CONFIG_PREALLOC_MQ_MSGS=4 diff --git a/nuttx-configs/px4io-v1/nsh/Make.defs b/nuttx-configs/px4io-v1/nsh/Make.defs index e96be6a1f..b4f5577ae 100644 --- a/nuttx-configs/px4io-v1/nsh/Make.defs +++ b/nuttx-configs/px4io-v1/nsh/Make.defs @@ -108,6 +108,7 @@ endif ARCHCFLAGS = -std=gnu99 ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=gnu++0x ARCHWARNINGS = -Wall \ + -Wno-sign-compare \ -Wextra \ -Wdouble-promotion \ -Wshadow \ diff --git a/nuttx-configs/px4io-v2/nsh/Make.defs b/nuttx-configs/px4io-v2/nsh/Make.defs index 4a8df2738..51420eb23 100644 --- a/nuttx-configs/px4io-v2/nsh/Make.defs +++ b/nuttx-configs/px4io-v2/nsh/Make.defs @@ -108,6 +108,7 @@ endif ARCHCFLAGS = -std=gnu99 ARCHCXXFLAGS = -fno-exceptions -fno-rtti -std=gnu++0x ARCHWARNINGS = -Wall \ + -Wno-sign-compare \ -Wextra \ -Wdouble-promotion \ -Wshadow \ |