diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-26 17:42:26 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-26 17:42:26 +0100 |
| commit | dc5228fcca46adbbe0d8db05fbd75dc8459ca41c (patch) | |
| tree | 0c8685fb2b49cc50102885776d85dabe2074bd3d | |
| parent | 2f6767480b5c88c16ec181b47d194bd9dabdc959 (diff) | |
| parent | f1c5fcd8da98e16588ac17e4da9ae8ef69fb461b (diff) | |
| download | px4-firmware-dc5228fcca46adbbe0d8db05fbd75dc8459ca41c.tar.gz px4-firmware-dc5228fcca46adbbe0d8db05fbd75dc8459ca41c.tar.bz2 px4-firmware-dc5228fcca46adbbe0d8db05fbd75dc8459ca41c.zip | |
Merge branch 'master' into indoor
| -rw-r--r-- | Makefile | 12 | ||||
| -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-v2/nsh/Make.defs | 1 | ||||
| -rw-r--r-- | nuttx-configs/px4io-v1/nsh/Make.defs | 1 | ||||
| -rw-r--r-- | nuttx-configs/px4io-v2/nsh/Make.defs | 1 |
6 files changed, 12 insertions, 5 deletions
@@ -245,14 +245,16 @@ tests: # .PHONY: clean clean: - $(Q) $(RMDIR) $(BUILD_DIR)*.build > /dev/null - $(Q) $(REMOVE) $(IMAGE_DIR)*.px4 > /dev/null + @echo > /dev/null + $(Q) $(RMDIR) $(BUILD_DIR)*.build + $(Q) $(REMOVE) $(IMAGE_DIR)*.px4 .PHONY: distclean distclean: clean - $(Q) $(REMOVE) $(ARCHIVE_DIR)*.export > /dev/null - $(Q) $(MAKE) -C $(NUTTX_SRC) -r $(MQUIET) distclean > /dev/null - $(Q) (cd $(NUTTX_SRC)/configs && $(FIND) . -maxdepth 1 -type l -delete) > /dev/null + @echo > /dev/null + $(Q) $(REMOVE) $(ARCHIVE_DIR)*.export + $(Q) $(MAKE) -C $(NUTTX_SRC) -r $(MQUIET) distclean + $(Q) (cd $(NUTTX_SRC)/configs && $(FIND) . -maxdepth 1 -type l -delete) # # Print some help text 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-v2/nsh/Make.defs b/nuttx-configs/px4fmu-v2/nsh/Make.defs index f660deeca..99f3b3140 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=gnu++0x ARCHWARNINGS = -Wall \ + -Wno-sign-compare \ -Wextra \ -Wdouble-promotion \ -Wshadow \ 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 \ |