diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-12 20:38:39 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-12 20:38:39 +0100 |
commit | 89e6b3f60621eb1b60dc58b60ea3c7c01dfb11cc (patch) | |
tree | 7f14acb4bbc67b641e4212a7685990278ab10217 /makefiles | |
parent | d69d895f0240a0dda5fda2f8f046179b069439a4 (diff) | |
parent | f5b21fbcde2b439ccdbd7f824adeea6ec78ea0b5 (diff) | |
download | px4-firmware-89e6b3f60621eb1b60dc58b60ea3c7c01dfb11cc.tar.gz px4-firmware-89e6b3f60621eb1b60dc58b60ea3c7c01dfb11cc.tar.bz2 px4-firmware-89e6b3f60621eb1b60dc58b60ea3c7c01dfb11cc.zip |
Merge branch 'master' of github.com:PX4/Firmware into laser_rangefinder
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 1 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 2 | ||||
-rw-r--r-- | makefiles/firmware.mk | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index aff614cbb..651c2ac38 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -56,6 +56,7 @@ MODULES += systemcmds/tests MODULES += systemcmds/config MODULES += systemcmds/nshterm MODULES += systemcmds/hw_ver +MODULES += systemcmds/dumpfile # # General system control diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index aac5beeb1..c80bc741d 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -64,6 +64,7 @@ MODULES += systemcmds/config MODULES += systemcmds/nshterm MODULES += systemcmds/mtd MODULES += systemcmds/hw_ver +MODULES += systemcmds/dumpfile # # General system control @@ -72,6 +73,7 @@ MODULES += modules/commander MODULES += modules/navigator MODULES += modules/mavlink MODULES += modules/mavlink_onboard +MODULES += modules/gpio_led # # Estimation modules (EKF/ SO3 / other filters) diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index cb20d9cd1..1b646d9e0 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -355,6 +355,9 @@ ROMFS_OBJ = $(ROMFS_CSRC:.c=.o) LIBS += $(ROMFS_OBJ) LINK_DEPS += $(ROMFS_OBJ) +# Remove all comments from startup and mixer files +ROMFS_PRUNER = $(PX4_BASE)/Tools/px_romfs_pruner.py + # Turn the ROMFS image into an object file $(ROMFS_OBJ): $(ROMFS_IMG) $(GLOBAL_DEPS) $(call BIN_TO_OBJ,$<,$@,romfs_img) @@ -372,6 +375,7 @@ ifneq ($(ROMFS_EXTRA_FILES),) $(Q) $(MKDIR) -p $(ROMFS_SCRATCH)/extras $(Q) $(COPY) $(ROMFS_EXTRA_FILES) $(ROMFS_SCRATCH)/extras endif + $(Q) $(PYTHON) -u $(ROMFS_PRUNER) --folder $(ROMFS_SCRATCH) EXTRA_CLEANS += $(ROMGS_OBJ) $(ROMFS_IMG) |