diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-06-01 13:34:49 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-06-01 13:34:49 +0400 |
| commit | b344f23dafdd68168dccc49ce2676abc237e8827 (patch) | |
| tree | 7ac058f876e335f7b859ad34f88684479ff4e10b /makefiles | |
| parent | 1bf8f7b47ec8dd8f2f494fe40f193b3d1712e025 (diff) | |
| parent | 27ee36b2049167a1272122548fe61aa2993d79c1 (diff) | |
| download | px4-firmware-b344f23dafdd68168dccc49ce2676abc237e8827.tar.gz px4-firmware-b344f23dafdd68168dccc49ce2676abc237e8827.tar.bz2 px4-firmware-b344f23dafdd68168dccc49ce2676abc237e8827.zip | |
Merge branch 'master' into sdlog2
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index b6fa4014a..53f371f90 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -56,6 +56,7 @@ MODULES += systemcmds/tests MODULES += modules/commander MODULES += modules/mavlink MODULES += modules/mavlink_onboard +MODULES += modules/gpio_led # # Estimation modules (EKF / other filters) diff --git a/makefiles/toolchain_gnu-arm-eabi.mk b/makefiles/toolchain_gnu-arm-eabi.mk index eeba0ff2c..c75a08bd1 100644 --- a/makefiles/toolchain_gnu-arm-eabi.mk +++ b/makefiles/toolchain_gnu-arm-eabi.mk @@ -219,7 +219,7 @@ endef define PRELINK @$(ECHO) "PRELINK: $1" @$(MKDIR) -p $(dir $1) - $(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1 + $(Q) $(LD) -Ur -Map $1.map -o $1 $2 && $(OBJCOPY) --localize-hidden $1 endef # Update the archive $1 with the files in $2 |