aboutsummaryrefslogtreecommitdiff
path: root/makefiles/upload.mk
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-04-28 12:47:34 -0700
committerpx4dev <px4@purgatory.org>2013-04-28 12:47:34 -0700
commitedf96fc8085510765c503350d29c96a2789bdbc0 (patch)
treea5cec3909f96077d590afb3bb5be0044d90a36e8 /makefiles/upload.mk
parentdc2c3cad3e8897d7ae299d41d16845000efe3c69 (diff)
downloadpx4-firmware-edf96fc8085510765c503350d29c96a2789bdbc0.tar.gz
px4-firmware-edf96fc8085510765c503350d29c96a2789bdbc0.tar.bz2
px4-firmware-edf96fc8085510765c503350d29c96a2789bdbc0.zip
Remove some naked command invocations.
Diffstat (limited to 'makefiles/upload.mk')
-rw-r--r--makefiles/upload.mk13
1 files changed, 8 insertions, 5 deletions
diff --git a/makefiles/upload.mk b/makefiles/upload.mk
index f23d6ae41..5ef92728f 100644
--- a/makefiles/upload.mk
+++ b/makefiles/upload.mk
@@ -25,7 +25,10 @@ endif
all: upload-$(METHOD)-$(BOARD)
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)
#
# JTAG firmware uploading with OpenOCD
@@ -33,9 +36,9 @@ upload-serial-px4fmu: $(BUNDLE) $(UPLOADER)
JTAGCONFIG ?= interface/olimex-jtag-tiny.cfg
upload-jtag-px4fmu: all
- @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
+ @$(ECHO) Attempting to flash PX4FMU board via JTAG
+ $(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
- @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
+ @$(ECHO) Attempting to flash PX4IO board via JTAG
+ $(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