diff options
| author | Hyon Lim (Retina) <limhyon@gmail.com> | 2013-05-28 11:09:58 +1000 |
|---|---|---|
| committer | Hyon Lim (Retina) <limhyon@gmail.com> | 2013-05-28 11:09:58 +1000 |
| commit | 13faf0d55526c65e33ec62546f106ecb5395a9c5 (patch) | |
| tree | 2bc793e1330846b9184503b62d6d32df09b9b82a /makefiles | |
| parent | 4bf05054218efab3b3dc182939f32a96f5ed1673 (diff) | |
| parent | f1a8f6e75b98768daa5bc5290ccf60156d8185da (diff) | |
| download | px4-firmware-13faf0d55526c65e33ec62546f106ecb5395a9c5.tar.gz px4-firmware-13faf0d55526c65e33ec62546f106ecb5395a9c5.tar.bz2 px4-firmware-13faf0d55526c65e33ec62546f106ecb5395a9c5.zip | |
Merge remote-tracking branch 'upstream/master'
- Mikrokopter BLCTRL seems to be updated
- HMC5883L calibration problem has been corrected.
(This is because of RAM mis allocation?)
See https://groups.google.com/forum/?fromgroups#!topic/px4users/yTYJiDBBKfo
- Fixed wing control updated
https://groups.google.com/forum/?fromgroups#!topic/px4users/s7owpvZN8UI
- GPIO module has been removed.
- STM32 DRV updated
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/toolchain_gnu-arm-eabi.mk | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 4cf650a98..437f1cd17 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 874e7154c..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 @@ -235,7 +235,7 @@ endef define LINK @$(ECHO) "LINK: $1" @$(MKDIR) -p $(dir $1) - $(Q) $(LD) $(LDFLAGS) -o $1 --start-group $2 $(LIBS) $(EXTRA_LIBS) $(LIBGCC) --end-group + $(Q) $(LD) $(LDFLAGS) -Map $1.map -o $1 --start-group $2 $(LIBS) $(EXTRA_LIBS) $(LIBGCC) --end-group endef # Convert $1 from a linked object to a raw binary in $2 @@ -280,6 +280,7 @@ define BIN_TO_OBJ $(Q) $(OBJCOPY) $2 \ --redefine-sym $(call BIN_SYM_PREFIX,$1)_start=$3 \ --redefine-sym $(call BIN_SYM_PREFIX,$1)_size=$3_len \ - --strip-symbol $(call BIN_SYM_PREFIX,$1)_end + --strip-symbol $(call BIN_SYM_PREFIX,$1)_end \ + --rename-section .data=.rodata $(Q) $(REMOVE) $2.c $2.c.o endef |