diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-12 20:35:20 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-12 20:35:20 +0100 |
| commit | caef8d115c1b72e8a25dcf5ba589a719dc2d1592 (patch) | |
| tree | c1df6077bbde524b67fcf09f3b5403899cf45e1f /makefiles | |
| parent | 7749ed1d8371d5caaf799f3264660ac8ceed7a81 (diff) | |
| parent | db04e00060919b7b852cb8aeb106d665c0775b70 (diff) | |
| download | px4-firmware-caef8d115c1b72e8a25dcf5ba589a719dc2d1592.tar.gz px4-firmware-caef8d115c1b72e8a25dcf5ba589a719dc2d1592.tar.bz2 px4-firmware-caef8d115c1b72e8a25dcf5ba589a719dc2d1592.zip | |
Merge branch 'master' of github.com:PX4/Firmware into gpio_led_fmuv2
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/firmware.mk | 4 |
3 files changed, 6 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 3a3743893..7ec314460 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -63,6 +63,7 @@ MODULES += systemcmds/config MODULES += systemcmds/nshterm MODULES += systemcmds/mtd MODULES += systemcmds/hw_ver +MODULES += systemcmds/dumpfile # # General system control 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) |