From edf96fc8085510765c503350d29c96a2789bdbc0 Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Sun, 28 Apr 2013 12:47:34 -0700
Subject: [PATCH] Remove some naked command invocations.

---
 makefiles/module.mk |  2 +-
 makefiles/setup.mk  |  2 ++
 makefiles/upload.mk | 13 ++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/makefiles/module.mk b/makefiles/module.mk
index 86810627b2..59c67f574d 100644
--- a/makefiles/module.mk
+++ b/makefiles/module.mk
@@ -153,7 +153,7 @@ $(MODULE_COMMAND_FILES): exclude = $(dir $@)COMMAND.$(command).*
 $(MODULE_COMMAND_FILES): $(GLOBAL_DEPS)
 	@$(REMOVE) -f $(exclude)
 	@$(MKDIR) -p $(dir $@)
-	@echo "CMD:     $(command)"
+	@$(ECHO) "CMD:     $(command)"
 	$(Q) $(TOUCH) $@
 endif
 
diff --git a/makefiles/setup.mk b/makefiles/setup.mk
index 8072ec7915..1111930937 100644
--- a/makefiles/setup.mk
+++ b/makefiles/setup.mk
@@ -72,6 +72,8 @@ export TOUCH		 = touch
 export MKDIR		 = mkdir
 export ECHO		 = echo
 export UNZIP_CMD	 = unzip
+export PYTHON		 = python
+export OPENOCD		 = openocd
 
 #
 # Host-specific paths, hacks and fixups
diff --git a/makefiles/upload.mk b/makefiles/upload.mk
index f23d6ae41a..5ef92728fe 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