Merge branch 'export-build' of github.com:PX4/Firmware into export-build

makefiles/toolchain_gnu-arm-eabi.mk

@@ -144,6 +144,7 @@ CFLAGS			 = $(ARCHCFLAGS) \
 			   $(INSTRUMENTATIONDEFINES) \
 			   $(ARCHDEFINES) \
 			   $(EXTRADEFINES) \
+			   $(EXTRACFLAGS) \
 			   -fno-common \
 			   $(addprefix -I,$(INCLUDE_DIRS))
 
@@ -156,18 +157,22 @@ CXXFLAGS		 = $(ARCHCXXFLAGS) \
 			   $(ARCHXXINCLUDES) \
 			   $(INSTRUMENTATIONDEFINES) \
 			   $(ARCHDEFINES) \
-			   $(EXTRADEFINES) \
 			   -DCONFIG_WCHAR_BUILTIN \
+			   $(EXTRADEFINES) \
+			   $(EXTRACXXFLAGS) \
 			   $(addprefix -I,$(INCLUDE_DIRS))
 
 # Flags we pass to the assembler
 #
-AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__
+AFLAGS			 = $(CFLAGS) -D__ASSEMBLY__ \
+			   $(EXTRADEFINES) \
+			   $(EXTRAAFLAGS)
 
 # Flags we pass to the linker
 #
 LDFLAGS			+= --warn-common \
 			   --gc-sections \
+			   $(EXTRALDFLAGS) \
 			   $(addprefix -T,$(LDSCRIPT)) \
 			   $(addprefix -L,$(LIB_DIRS))
 
@@ -189,7 +194,7 @@ DEP_INCLUDES		 = $(subst .o,.d,$(OBJS))
 define COMPILE
 	@$(ECHO) "CC:      $1"
 	@$(MKDIR) -p $(dir $2)
-	$(Q) $(CC) -MD -c $(CFLAGS) $(EXTRAFLAGS) $(abspath $1) -o $2
+	$(Q) $(CC) -MD -c $(CFLAGS) $(abspath $1) -o $2
 endef
 
 # Compile C++ source $1 to $2
@@ -198,7 +203,7 @@ endef
 define COMPILEXX
 	@$(ECHO) "CXX:     $1"
 	@$(MKDIR) -p $(dir $2)
-	$(Q) $(CXX) -MD -c $(CXXFLAGS) $(EXTRAFLAGS) $(abspath $1) -o $2
+	$(Q) $(CXX) -MD -c $(CXXFLAGS) $(abspath $1) -o $2
 endef
 
 # Assemble $1 into $2
@@ -206,7 +211,7 @@ endef
 define ASSEMBLE
 	@$(ECHO) "AS:      $1"
 	@$(MKDIR) -p $(dir $2)
-	$(Q) $(CC) -c $(AFLAGS) $(EXTRAFLAGS) $(abspath $1) -o $2
+	$(Q) $(CC) -c $(AFLAGS) $(abspath $1) -o $2
 endef
 
 # Produce partially-linked $1 from files in $2

src/systemcmds/pwm/pwm.c

@@ -78,7 +78,7 @@ usage(const char *reason)
 		"  <channel_group>    Channel group that should update at the alternate rate (may be specified more than once)\n"
 		"  arm | disarm       Arm or disarm the ouptut\n"
 		"  <channel_value>... PWM output values in microseconds to assign to the PWM outputs\n"
-	        "  <chanmask>         Directly supply alt rate channel mask\n"
+		"  <chanmask>         Directly supply alt rate channel mask (debug use only)\n"
 		"\n"
 		"When -c is specified, any channel groups not listed with -c will update at the default rate.\n"
 		);