diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-31 09:51:59 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-31 09:51:59 +0100 |
commit | d2b183c05bba5443d24e8df8b6fc5f52bd27275d (patch) | |
tree | 99b1ee91cbb108a35ce00c8cc632f635c6022f03 /makefiles | |
parent | fb446c01b815b00f5da098d340557164fdbf78c9 (diff) | |
parent | 83df116c7aa21b6d68f2aa31c4526dd822495d70 (diff) | |
download | px4-firmware-d2b183c05bba5443d24e8df8b6fc5f52bd27275d.tar.gz px4-firmware-d2b183c05bba5443d24e8df8b6fc5f52bd27275d.tar.bz2 px4-firmware-d2b183c05bba5443d24e8df8b6fc5f52bd27275d.zip |
merge master
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 4 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v1_test.mk | 48 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 2 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 1 |
4 files changed, 4 insertions, 51 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index a5fd316d6..305cc567f 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 @@ -58,6 +57,7 @@ MODULES += systemcmds/top MODULES += systemcmds/tests MODULES += systemcmds/config MODULES += systemcmds/nshterm +MODULES += systemcmds/hw_ver # # General system control diff --git a/makefiles/config_px4fmu-v1_test.mk b/makefiles/config_px4fmu-v1_test.mk deleted file mode 100644 index 41e8b95ff..000000000 --- a/makefiles/config_px4fmu-v1_test.mk +++ /dev/null @@ -1,48 +0,0 @@ -# -# Makefile for the px4fmu_default configuration -# - -# -# 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 - -# -# Library modules -# -MODULES += modules/systemlib -MODULES += modules/systemlib/mixer -MODULES += modules/uORB - -# -# Transitional support - add commands from the NuttX export archive. -# -# In general, these should move to modules over time. -# -# Each entry here is <command>.<priority>.<stacksize>.<entrypoint> but we use a helper macro -# to make the table a bit more readable. -# -define _B - $(strip $1).$(or $(strip $2),SCHED_PRIORITY_DEFAULT).$(or $(strip $3),CONFIG_PTHREAD_STACK_DEFAULT).$(strip $4) -endef - -# command priority stack entrypoint -BUILTIN_COMMANDS := \ - $(call _B, sercon, , 2048, sercon_main ) \ - $(call _B, serdis, , 2048, serdis_main ) diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 25b93118b..7f9e76de1 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -46,7 +46,6 @@ MODULES += modules/sensors # # System commands # -MODULES += systemcmds/ramtron MODULES += systemcmds/bl_update MODULES += systemcmds/boardinfo MODULES += systemcmds/mixer @@ -61,6 +60,7 @@ MODULES += systemcmds/tests MODULES += systemcmds/config MODULES += systemcmds/nshterm MODULES += systemcmds/mtd +MODULES += systemcmds/hw_ver # # General system control diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index f54a4d825..d5a50cfae 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -23,6 +23,7 @@ MODULES += systemcmds/reboot MODULES += systemcmds/tests MODULES += systemcmds/nshterm MODULES += systemcmds/mtd +MODULES += systemcmds/hw_ver # # Library modules |