Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 02:16:53 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lorenz Meier
2013-05-06 07:55:12 +02:00
parent 4611fca7b4 3b65281f00
commit 4a44e10411
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/toolchain_gnu-arm-eabi.mk
+10 -5
View File
@@ -144,6 +144,7 @@ CFLAGS = $(ARCHCFLAGS) \
$(INSTRUMENTATIONDEFINES) \ $(INSTRUMENTATIONDEFINES) \
$(ARCHDEFINES) \ $(ARCHDEFINES) \
$(EXTRADEFINES) \ $(EXTRADEFINES) \
$(EXTRACFLAGS) \
-fno-common \ -fno-common \
$(addprefix -I,$(INCLUDE_DIRS)) $(addprefix -I,$(INCLUDE_DIRS))
@@ -156,18 +157,22 @@ CXXFLAGS = $(ARCHCXXFLAGS) \
$(ARCHXXINCLUDES) \ $(ARCHXXINCLUDES) \
$(INSTRUMENTATIONDEFINES) \ $(INSTRUMENTATIONDEFINES) \
$(ARCHDEFINES) \ $(ARCHDEFINES) \
$(EXTRADEFINES) \
-DCONFIG_WCHAR_BUILTIN \ -DCONFIG_WCHAR_BUILTIN \
$(EXTRADEFINES) \
$(EXTRACXXFLAGS) \
$(addprefix -I,$(INCLUDE_DIRS)) $(addprefix -I,$(INCLUDE_DIRS))
# Flags we pass to the assembler # Flags we pass to the assembler
# #
AFLAGS = $(CFLAGS) -D__ASSEMBLY__ AFLAGS = $(CFLAGS) -D__ASSEMBLY__ \
$(EXTRADEFINES) \
$(EXTRAAFLAGS)
# Flags we pass to the linker # Flags we pass to the linker
# #
LDFLAGS += --warn-common \ LDFLAGS += --warn-common \
--gc-sections \ --gc-sections \
$(EXTRALDFLAGS) \
$(addprefix -T,$(LDSCRIPT)) \ $(addprefix -T,$(LDSCRIPT)) \
$(addprefix -L,$(LIB_DIRS)) $(addprefix -L,$(LIB_DIRS))
@@ -189,7 +194,7 @@ DEP_INCLUDES = $(subst .o,.d,$(OBJS))
define COMPILE define COMPILE
@$(ECHO) "CC: $1" @$(ECHO) "CC: $1"
@$(MKDIR) -p $(dir $2) @$(MKDIR) -p $(dir $2)
$(Q) $(CC) -MD -c $(CFLAGS) $(EXTRAFLAGS) $(abspath $1) -o $2 $(Q) $(CC) -MD -c $(CFLAGS) $(abspath $1) -o $2
endef endef
# Compile C++ source $1 to $2 # Compile C++ source $1 to $2
@@ -198,7 +203,7 @@ endef
define COMPILEXX define COMPILEXX
@$(ECHO) "CXX: $1" @$(ECHO) "CXX: $1"
@$(MKDIR) -p $(dir $2) @$(MKDIR) -p $(dir $2)
$(Q) $(CXX) -MD -c $(CXXFLAGS) $(EXTRAFLAGS) $(abspath $1) -o $2 $(Q) $(CXX) -MD -c $(CXXFLAGS) $(abspath $1) -o $2
endef endef
# Assemble $1 into $2 # Assemble $1 into $2
@@ -206,7 +211,7 @@ endef
define ASSEMBLE define ASSEMBLE
@$(ECHO) "AS: $1" @$(ECHO) "AS: $1"
@$(MKDIR) -p $(dir $2) @$(MKDIR) -p $(dir $2)
$(Q) $(CC) -c $(AFLAGS) $(EXTRAFLAGS) $(abspath $1) -o $2 $(Q) $(CC) -c $(AFLAGS) $(abspath $1) -o $2
endef endef
# Produce partially-linked $1 from files in $2 # Produce partially-linked $1 from files in $2
src/systemcmds/pwm/pwm.c
+1 -1
View File
@@ -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" " <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" " arm | disarm Arm or disarm the ouptut\n"
" <channel_value>... PWM output values in microseconds to assign to the PWM outputs\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" "\n"
"When -c is specified, any channel groups not listed with -c will update at the default rate.\n" "When -c is specified, any channel groups not listed with -c will update at the default rate.\n"
); );