diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-12 12:27:17 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-12 12:27:17 +0100 |
commit | 0d3a743f75d50163568203a413d8e72dac6636c5 (patch) | |
tree | 7b7672fb0dc4a33536f7042be75471206dddb86a /makefiles | |
parent | 0bcdfa18c7c71e9e936ba98122012079201963cf (diff) | |
parent | 5a0c6353690a903b0cbf03aee7cb040726f25fd8 (diff) | |
download | px4-firmware-0d3a743f75d50163568203a413d8e72dac6636c5.tar.gz px4-firmware-0d3a743f75d50163568203a413d8e72dac6636c5.tar.bz2 px4-firmware-0d3a743f75d50163568203a413d8e72dac6636c5.zip |
Merge branch 'master' into paul_estimator
ssage aborts
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index cc4b290ae..25b93118b 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -60,6 +60,7 @@ MODULES += systemcmds/top MODULES += systemcmds/tests MODULES += systemcmds/config MODULES += systemcmds/nshterm +MODULES += systemcmds/mtd # # General system control diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 6faef7e0a..f54a4d825 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -22,6 +22,7 @@ MODULES += systemcmds/perf MODULES += systemcmds/reboot MODULES += systemcmds/tests MODULES += systemcmds/nshterm +MODULES += systemcmds/mtd # # Library modules |