diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-06 22:14:19 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-06 22:14:19 +0200 |
| commit | b52aeea746f7b38633cc571f5d8a6a849ed5e218 (patch) | |
| tree | e804365f0e4f64597ab856571e154c9d583d20cf /makefiles | |
| parent | b3c5bd5d3a3cc4b480c40b524484aca2b9a66422 (diff) | |
| parent | 2aa16dc44764485639921eb4adbbca429c3a4773 (diff) | |
| download | px4-firmware-b52aeea746f7b38633cc571f5d8a6a849ed5e218.tar.gz px4-firmware-b52aeea746f7b38633cc571f5d8a6a849ed5e218.tar.bz2 px4-firmware-b52aeea746f7b38633cc571f5d8a6a849ed5e218.zip | |
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 4 | ||||
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 37a05c90f..d50eb1e50 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -62,7 +62,8 @@ MODULES += modules/gpio_led # Estimation modules (EKF / other filters) # MODULES += modules/attitude_estimator_ekf -MODULES += modules/position_estimator_mc +MODULES += modules/attitude_estimator_so3_comp +#MODULES += modules/position_estimator_mc MODULES += modules/position_estimator MODULES += modules/att_pos_estimator_ekf @@ -79,6 +80,7 @@ MODULES += modules/multirotor_pos_control # Logging # MODULES += modules/sdlog +MODULES += modules/sdlog2 # # Library modules diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index c75a08bd1..99c2776fd 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -70,6 +70,14 @@ ARCHCPUFLAGS_CORTEXM3 = -mcpu=cortex-m3 \ -march=armv7-m \ -mfloat-abi=soft +ARCHINSTRUMENTATIONDEFINES_CORTEXM4F = -finstrument-functions \ + -ffixed-r10 + +ARCHINSTRUMENTATIONDEFINES_CORTEXM4 = -finstrument-functions \ + -ffixed-r10 + +ARCHINSTRUMENTATIONDEFINES_CORTEXM3 = + # Pick the right set of flags for the architecture. # ARCHCPUFLAGS = $(ARCHCPUFLAGS_$(CONFIG_ARCH)) @@ -91,8 +99,8 @@ ARCHOPTIMIZATION = $(MAXOPTIMIZATION) \ # enable precise stack overflow tracking # note - requires corresponding support in NuttX -INSTRUMENTATIONDEFINES = -finstrument-functions \ - -ffixed-r10 +INSTRUMENTATIONDEFINES = $(ARCHINSTRUMENTATIONDEFINES_$(CONFIG_ARCH)) + # Language-specific flags # ARCHCFLAGS = -std=gnu99 |