dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Remove some naked command invocations.

This commit is contained in:
px4dev 2013-04-28 12:47:34 -07:00
parent 00daa29b1f
commit 03eb16f874
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefiles/module.mk
View File

@ -153,7 +153,7 @@ $(MODULE_COMMAND_FILES): exclude = $(dir $@)COMMAND.$(command).*
$(MODULE_COMMAND_FILES): $(GLOBAL_DEPS) $(MODULE_COMMAND_FILES): $(GLOBAL_DEPS)
@$(REMOVE) -f $(exclude) @$(REMOVE) -f $(exclude)
@$(MKDIR) -p $(dir $@) @$(MKDIR) -p $(dir $@)
@echo "CMD: $(command)" @$(ECHO) "CMD: $(command)"
$(Q) $(TOUCH) $@ $(Q) $(TOUCH) $@
endif endif

2
makefiles/setup.mk
View File

@ -72,6 +72,8 @@ export TOUCH = touch
export MKDIR = mkdir export MKDIR = mkdir
export ECHO = echo export ECHO = echo
export UNZIP_CMD = unzip export UNZIP_CMD = unzip
export PYTHON = python
export OPENOCD = openocd
# #
# Host-specific paths, hacks and fixups # Host-specific paths, hacks and fixups

13
makefiles/upload.mk
View File

@ -25,7 +25,10 @@ endif
all: upload-$(METHOD)-$(BOARD) all: upload-$(METHOD)-$(BOARD)
upload-serial-px4fmu: $(BUNDLE) $(UPLOADER) upload-serial-px4fmu: $(BUNDLE) $(UPLOADER)
@python -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE) $(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE)
upload-serial-px4fmuv2: $(BUNDLE) $(UPLOADER)
$(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE)
upload-serial-px4fmuv2: $(BUNDLE) $(UPLOADER) upload-serial-px4fmuv2: $(BUNDLE) $(UPLOADER)
@python -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE) @python -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE)
@ -36,9 +39,9 @@ upload-serial-px4fmuv2: $(BUNDLE) $(UPLOADER)
JTAGCONFIG ?= interface/olimex-jtag-tiny.cfg JTAGCONFIG ?= interface/olimex-jtag-tiny.cfg
upload-jtag-px4fmu: all upload-jtag-px4fmu: all
@echo Attempting to flash PX4FMU board via JTAG @$(ECHO) Attempting to flash PX4FMU board via JTAG
@openocd -f $(JTAGCONFIG) -f ../Bootloader/stm32f4x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4fmu_bl.elf" -c "reset run" -c shutdown $(Q) $(OPENOCD) -f $(JTAGCONFIG) -f ../Bootloader/stm32f4x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4fmu_bl.elf" -c "reset run" -c shutdown
upload-jtag-px4io: all upload-jtag-px4io: all
@echo Attempting to flash PX4IO board via JTAG @$(ECHO) Attempting to flash PX4IO board via JTAG
@openocd -f $(JTAGCONFIG) -f ../Bootloader/stm32f1x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4io_bl.elf" -c "reset run" -c shutdown $(Q) $(OPENOCD) -f $(JTAGCONFIG) -f ../Bootloader/stm32f1x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4io_bl.elf" -c "reset run" -c shutdown