From aa09ebd7d3cb0d06781470e400e61c75b449985b Mon Sep 17 00:00:00 2001 From: px4dev Date: Sat, 6 Apr 2013 11:16:54 -0700 Subject: [PATCH] Share the ROMFS prototype betwen FMUv1 and v2 --- ROMFS/{px4fmu_default => px4fmu_common}/logging/logconv.m | 0 .../{px4fmu_default => px4fmu_common}/mixers/FMU_AERT.mix | 0 ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_AET.mix | 0 ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_Q.mix | 0 ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_RET.mix | 0 ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_X5.mix | 0 .../{px4fmu_default => px4fmu_common}/mixers/FMU_delta.mix | 0 .../{px4fmu_default => px4fmu_common}/mixers/FMU_hex_+.mix | 0 .../{px4fmu_default => px4fmu_common}/mixers/FMU_hex_x.mix | 0 .../mixers/FMU_octo_+.mix | 0 .../mixers/FMU_octo_x.mix | 0 .../{px4fmu_default => px4fmu_common}/mixers/FMU_pass.mix | 0 .../mixers/FMU_quad_+.mix | 0 .../mixers/FMU_quad_x.mix | 0 ROMFS/{px4fmu_default => px4fmu_common}/mixers/README | 0 makefiles/config_px4fmu_default.mk | 2 +- makefiles/config_px4fmuv2_default.mk | 2 +- makefiles/firmware.mk | 7 +++++-- makefiles/module.mk | 1 - 19 files changed, 7 insertions(+), 5 deletions(-) rename ROMFS/{px4fmu_default => px4fmu_common}/logging/logconv.m (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_AERT.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_AET.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_Q.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_RET.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_X5.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_delta.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_hex_+.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_hex_x.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_octo_+.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_octo_x.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_pass.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_quad_+.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/FMU_quad_x.mix (100%) rename ROMFS/{px4fmu_default => px4fmu_common}/mixers/README (100%) diff --git a/ROMFS/px4fmu_default/logging/logconv.m b/ROMFS/px4fmu_common/logging/logconv.m similarity index 100% rename from ROMFS/px4fmu_default/logging/logconv.m rename to ROMFS/px4fmu_common/logging/logconv.m diff --git a/ROMFS/px4fmu_default/mixers/FMU_AERT.mix b/ROMFS/px4fmu_common/mixers/FMU_AERT.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_AERT.mix rename to ROMFS/px4fmu_common/mixers/FMU_AERT.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_AET.mix b/ROMFS/px4fmu_common/mixers/FMU_AET.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_AET.mix rename to ROMFS/px4fmu_common/mixers/FMU_AET.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_Q.mix b/ROMFS/px4fmu_common/mixers/FMU_Q.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_Q.mix rename to ROMFS/px4fmu_common/mixers/FMU_Q.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_RET.mix b/ROMFS/px4fmu_common/mixers/FMU_RET.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_RET.mix rename to ROMFS/px4fmu_common/mixers/FMU_RET.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_X5.mix b/ROMFS/px4fmu_common/mixers/FMU_X5.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_X5.mix rename to ROMFS/px4fmu_common/mixers/FMU_X5.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_delta.mix b/ROMFS/px4fmu_common/mixers/FMU_delta.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_delta.mix rename to ROMFS/px4fmu_common/mixers/FMU_delta.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_hex_+.mix b/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_hex_+.mix rename to ROMFS/px4fmu_common/mixers/FMU_hex_+.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_hex_x.mix b/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_hex_x.mix rename to ROMFS/px4fmu_common/mixers/FMU_hex_x.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_octo_+.mix b/ROMFS/px4fmu_common/mixers/FMU_octo_+.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_octo_+.mix rename to ROMFS/px4fmu_common/mixers/FMU_octo_+.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_octo_x.mix b/ROMFS/px4fmu_common/mixers/FMU_octo_x.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_octo_x.mix rename to ROMFS/px4fmu_common/mixers/FMU_octo_x.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_pass.mix b/ROMFS/px4fmu_common/mixers/FMU_pass.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_pass.mix rename to ROMFS/px4fmu_common/mixers/FMU_pass.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_quad_+.mix b/ROMFS/px4fmu_common/mixers/FMU_quad_+.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_quad_+.mix rename to ROMFS/px4fmu_common/mixers/FMU_quad_+.mix diff --git a/ROMFS/px4fmu_default/mixers/FMU_quad_x.mix b/ROMFS/px4fmu_common/mixers/FMU_quad_x.mix similarity index 100% rename from ROMFS/px4fmu_default/mixers/FMU_quad_x.mix rename to ROMFS/px4fmu_common/mixers/FMU_quad_x.mix diff --git a/ROMFS/px4fmu_default/mixers/README b/ROMFS/px4fmu_common/mixers/README similarity index 100% rename from ROMFS/px4fmu_default/mixers/README rename to ROMFS/px4fmu_common/mixers/README diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index a6d766511c..b9ce1123f1 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -5,7 +5,7 @@ # # Use the configuration's ROMFS. # -ROMFS_ROOT = $(PX4_BASE)/ROMFS/$(CONFIG) +ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_common # # Transitional support - add commands from the NuttX export archive. diff --git a/makefiles/config_px4fmuv2_default.mk b/makefiles/config_px4fmuv2_default.mk index 374c0cfe98..bd324d7d0d 100644 --- a/makefiles/config_px4fmuv2_default.mk +++ b/makefiles/config_px4fmuv2_default.mk @@ -5,7 +5,7 @@ # # Use the configuration's ROMFS. # -ROMFS_ROOT = $(PX4_BASE)/ROMFS/$(CONFIG) +ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_common # # Board support modules diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index c34382ae0b..a2227b5c45 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -246,6 +246,9 @@ include $(PX4_MK_DIR)/nuttx.mk ################################################################################ ifneq ($(ROMFS_ROOT),) +ifeq ($(wildcard $(ROMFS_ROOT)),) +$(error ROMFS_ROOT specifies a directory that does not exist) +endif # # Note that there is no support for more than one root directory or constructing @@ -272,7 +275,7 @@ $(ROMFS_OBJ): $(ROMFS_IMG) $(GLOBAL_DEPS) # Generate the ROMFS image from the root $(ROMFS_IMG): $(ROMFS_DEPS) $(GLOBAL_DEPS) - @$(ECHO) %% generating $@ + @$(ECHO) "ROMFS: $@" $(Q) $(GENROMFS) -f $@ -d $(ROMFS_ROOT) -V "NSHInitVol" EXTRA_CLEANS += $(ROMGS_OBJ) $(ROMFS_IMG) @@ -318,7 +321,7 @@ endef # Don't generate until modules have updated their command files $(BUILTIN_CSRC): $(GLOBAL_DEPS) $(MODULE_OBJS) $(BUILTIN_COMMAND_FILES) - @$(ECHO) %% generating $@ + @$(ECHO) "CMDS: $@" $(Q) $(ECHO) '/* builtin command list - automatically generated, do not edit */' > $@ $(Q) $(ECHO) '#include ' >> $@ $(Q) $(ECHO) '#include ' >> $@ diff --git a/makefiles/module.mk b/makefiles/module.mk index 154d37cc2b..1db0f6fee6 100644 --- a/makefiles/module.mk +++ b/makefiles/module.mk @@ -145,7 +145,6 @@ MODULE_COMMAND_FILES := $(addprefix $(WORK_DIR)/builtin_commands/COMMAND.,$(MODU $(MODULE_COMMAND_FILES): command = $(word 2,$(subst ., ,$(notdir $(@)))) $(MODULE_COMMAND_FILES): exclude = $(dir $@)COMMAND.$(command).* $(MODULE_COMMAND_FILES): $(GLOBAL_DEPS) - @$(ECHO) COMMAND: $(command) @$(REMOVE) -f $(exclude) @$(MKDIR) -p $(dir $@) $(Q) $(TOUCH) $@