diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-05-28 19:04:29 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-05-28 19:04:29 +0400 |
| commit | 234b9c8f670d8794a73ea467f26376610347aa62 (patch) | |
| tree | 76c59c5acae0928629542ad793112d6ccf6be20e /makefiles | |
| parent | f8900f002ca553fa6eaf04207623472267094f16 (diff) | |
| parent | 27ee36b2049167a1272122548fe61aa2993d79c1 (diff) | |
| download | px4-firmware-234b9c8f670d8794a73ea467f26376610347aa62.tar.gz px4-firmware-234b9c8f670d8794a73ea467f26376610347aa62.tar.bz2 px4-firmware-234b9c8f670d8794a73ea467f26376610347aa62.zip | |
Merge branch 'master' into seatbelt_multirotor
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 b1737ee6b..7a73d1a32 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 |