diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-16 11:10:23 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-16 11:10:23 +0200 |
| commit | 87b00c96e891a10315cdc18e7dbd1249b63d37d3 (patch) | |
| tree | 05ea2a62e951e9c4ca2e811f8ea750de0669068a | |
| parent | fef4362e79fb05ddf8caba4bb4365bab13b39ce6 (diff) | |
| parent | 3292ea24a16ebd65350e9f0c618fde4b2b4e8a97 (diff) | |
| download | px4-firmware-87b00c96e891a10315cdc18e7dbd1249b63d37d3.tar.gz px4-firmware-87b00c96e891a10315cdc18e7dbd1249b63d37d3.tar.bz2 px4-firmware-87b00c96e891a10315cdc18e7dbd1249b63d37d3.zip | |
Merge branch 'master' of github.com:PX4/Firmware
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | nuttx/configs/px4fmu/common/Make.defs | 18 |
2 files changed, 6 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore index a3c279d2d..38cb13162 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ Firmware.sublime-workspace nsh_romfsimg.h cscope.out .configX-e +nuttx-export.zip diff --git a/nuttx/configs/px4fmu/common/Make.defs b/nuttx/configs/px4fmu/common/Make.defs index 7ba4e694a..ff2e4c5fa 100644 --- a/nuttx/configs/px4fmu/common/Make.defs +++ b/nuttx/configs/px4fmu/common/Make.defs @@ -55,7 +55,7 @@ NM = $(CROSSDEV)nm OBJCOPY = $(CROSSDEV)objcopy OBJDUMP = $(CROSSDEV)objdump -MAXOPTIMIZATION = -Os +MAXOPTIMIZATION = -O3 ARCHCPUFLAGS = -mcpu=cortex-m4 \ -mthumb \ -march=armv7e-m \ @@ -116,7 +116,6 @@ ARCHOPTIMIZATION = $(MAXOPTIMIZATION) \ ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") ARCHOPTIMIZATION += -g -ARCHSCRIPT += -g endif ARCHCFLAGS = -std=gnu99 @@ -149,7 +148,7 @@ ARCHDEFINES = ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10 # this seems to be the only way to add linker flags -ARCHSCRIPT += --warn-common \ +EXTRA_LIBS += --warn-common \ --gc-sections CFLAGS = $(ARCHCFLAGS) $(ARCHCWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(INSTRUMENTATIONDEFINES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe -fno-common @@ -167,13 +166,6 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -# If VERBOSE is set, don't hide the compiler invocations. -ifeq ($(VERBOSE),YES) -_v = -else -_v = @ -endif - define PREPROCESS @echo "CPP: $1->$2" @$(CPP) $(CPPFLAGS) $(abspath $1) -o $2 @@ -181,17 +173,17 @@ endef define COMPILE @echo "CC: $1" - $(_v)$(CC) -c $(CFLAGS) $(abspath $1) -o $2 + $(Q)$(CC) -c $(CFLAGS) $(abspath $1) -o $2 endef define COMPILEXX @echo "CXX: $1" - $(_v)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2 + $(Q)$(CXX) -c $(CXXFLAGS) $(abspath $1) -o $2 endef define ASSEMBLE @echo "AS: $1" - $(_v)$(CC) -c $(AFLAGS) $(abspath $1) -o $2 + $(Q)$(CC) -c $(AFLAGS) $(abspath $1) -o $2 endef # produce partially-linked $1 from files in $2 |