diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-13 13:07:25 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-13 13:07:25 +0100 |
| commit | 7bcddd192fba723d165957043163762b2e08d802 (patch) | |
| tree | ad3a7d1d7a901d5d7a984a3f3aaa1b175ca358ca /makefiles | |
| parent | 8d7620c3cbe86414b84917350bcc99b65cef9b0d (diff) | |
| parent | f224374ed3c84717b8c92a3f0d6d902c5701eb04 (diff) | |
| download | px4-firmware-7bcddd192fba723d165957043163762b2e08d802.tar.gz px4-firmware-7bcddd192fba723d165957043163762b2e08d802.tar.bz2 px4-firmware-7bcddd192fba723d165957043163762b2e08d802.zip | |
Merge branch 'navigator_new' into navigator_new_vector
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_test.mk | 12 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/makefiles/config_px4fmu-v1_test.mk b/makefiles/config_px4fmu-v1_test.mk index 42a35c5dd..41e8b95ff 100644 --- a/makefiles/config_px4fmu-v1_test.mk +++ b/makefiles/config_px4fmu-v1_test.mk @@ -6,31 +6,29 @@ # Use the configuration's ROMFS. # ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_test +ROMFS_OPTIONAL_FILES = $(PX4_BASE)/Images/px4io-v1_default.bin # # Board support modules # MODULES += drivers/device MODULES += drivers/stm32 +MODULES += drivers/stm32/adc +MODULES += drivers/stm32/tone_alarm MODULES += drivers/led MODULES += drivers/boards/px4fmu-v1 +MODULES += drivers/px4io MODULES += systemcmds/perf MODULES += systemcmds/reboot MODULES += systemcmds/tests MODULES += systemcmds/nshterm # -# Libraries -# -LIBRARIES += lib/mathlib/CMSIS -MODULES += lib/mathlib - -# # Library modules # MODULES += modules/systemlib -MODULES += modules/uORB MODULES += modules/systemlib/mixer +MODULES += modules/uORB # # Transitional support - add commands from the NuttX export archive. diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 0f60e88b5..6faef7e0a 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -6,21 +6,28 @@ # Use the configuration's ROMFS. # ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_test +ROMFS_OPTIONAL_FILES = $(PX4_BASE)/Images/px4io-v2_default.bin # # Board support modules # MODULES += drivers/device MODULES += drivers/stm32 +MODULES += drivers/stm32/adc +MODULES += drivers/stm32/tone_alarm MODULES += drivers/led MODULES += drivers/boards/px4fmu-v2 +MODULES += drivers/px4io MODULES += systemcmds/perf MODULES += systemcmds/reboot +MODULES += systemcmds/tests +MODULES += systemcmds/nshterm # # Library modules # MODULES += modules/systemlib +MODULES += modules/systemlib/mixer MODULES += modules/uORB # |