diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-01-17 09:50:22 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-01-17 09:50:22 +0100 |
| commit | 73546b6645c5715ba0cecf00899632bf861321c9 (patch) | |
| tree | d0eb82de70d6cc02ef0e6a3ccfd89525478ab8e5 /makefiles/config_px4fmu-v1_default.mk | |
| parent | 14c0fae175452da6e28ffc20b265de621a2430ba (diff) | |
| parent | e691bab71a69216273fdc253695ef849671af9a7 (diff) | |
| download | px4-firmware-73546b6645c5715ba0cecf00899632bf861321c9.tar.gz px4-firmware-73546b6645c5715ba0cecf00899632bf861321c9.tar.bz2 px4-firmware-73546b6645c5715ba0cecf00899632bf861321c9.zip | |
Merge remote-tracking branch 'upstream/master' into navigator_new
Conflicts:
makefiles/config_px4fmu-v1_backside.mk
src/modules/commander/commander.cpp
src/modules/sdlog2/sdlog2.c
Diffstat (limited to 'makefiles/config_px4fmu-v1_default.mk')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 573b23221..afe5d2dc6 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -42,8 +42,7 @@ MODULES += modules/sensors # # System commands # -MODULES += systemcmds/eeprom -MODULES += systemcmds/ramtron +MODULES += systemcmds/mtd MODULES += systemcmds/bl_update MODULES += systemcmds/boardinfo MODULES += systemcmds/i2c |