diff options
| author | Julian Oes <julian@oes.ch> | 2014-03-29 11:16:15 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-03-29 11:16:15 +0100 |
| commit | 33d65eae97994ab5b47188853029965b18a819a2 (patch) | |
| tree | 8054384373de19db243a4a8289ff4c837da7d4ea /makefiles | |
| parent | 873fa4cb40a8ac5b57f3212bb233027f422b92a3 (diff) | |
| parent | 9b1de5004c673ebe8bdf68f1b518565cccd6b05b (diff) | |
| download | px4-firmware-33d65eae97994ab5b47188853029965b18a819a2.tar.gz px4-firmware-33d65eae97994ab5b47188853029965b18a819a2.tar.bz2 px4-firmware-33d65eae97994ab5b47188853029965b18a819a2.zip | |
Merge remote-tracking branch 'px4/master' into bottle_drop
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 4 | ||||
| -rw-r--r-- | makefiles/firmware.mk | 4 |
3 files changed, 8 insertions, 1 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 df34d2dce..3e79fac79 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -27,6 +27,7 @@ MODULES += drivers/l3gd20 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 MODULES += drivers/mb12xx +MODULES += drivers/sf0x MODULES += drivers/gps MODULES += drivers/hil MODULES += drivers/hott/hott_telemetry @@ -63,6 +64,7 @@ MODULES += systemcmds/config MODULES += systemcmds/nshterm MODULES += systemcmds/mtd MODULES += systemcmds/hw_ver +MODULES += systemcmds/dumpfile # # General system control @@ -70,7 +72,7 @@ MODULES += systemcmds/hw_ver 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) |