fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-25 07:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into linux

Browse Source 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	makefiles/firmware.mk
This commit is contained in:
Mark Charlebois
2015-04-22 10:38:46 -07:00
parent 8e500f543e 67956341e6
commit f63ab3d5e3
22 changed files with 229 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/nuttx_romfs.mk
+1 -1
View File
@@ -180,7 +180,7 @@ firmware: $(PRODUCT_BUNDLE)
$(PRODUCT_BUNDLE): $(PRODUCT_BIN)
@$(ECHO) %% Generating $@
ifdef GEN_PARAM_XML
python $(PX4_BASE)/Tools/px_process_params.py --src-path $(PX4_BASE)/src --xml
python $(PX4_BASE)/Tools/px_process_params.py --src-path $(PX4_BASE)/src --board CONFIG_ARCH_BOARD_$(CONFIG_BOARD) --xml
$(Q) $(MKFW) --prototype $(IMAGE_DIR)/$(BOARD).prototype \
--git_identity $(PX4_BASE) \
--parameter_xml $(PRODUCT_PARAMXML) \