From 9237f20bfb8acf26bc30c5908fa765fe62c90c4c Mon Sep 17 00:00:00 2001
From: Mike Smith <DrZiplok@me.com>
Date: Wed, 2 Nov 2011 22:54:05 -0700
Subject: [PATCH] Remove the old 'make upload' target, since it doesn't make as
 much sense anymore.  Add a script to do uploads instead.

---
 Firmware/include/rules.mk |  5 -----
 Firmware/tools/upload     | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100755 Firmware/tools/upload

diff --git a/Firmware/include/rules.mk b/Firmware/include/rules.mk
index ba6e7d47..9bf3f404 100644
--- a/Firmware/include/rules.mk
+++ b/Firmware/include/rules.mk
@@ -108,11 +108,6 @@ $(OBJROOT)/%.rel: $(PRODUCT_DIR)/%.asm
 	$(v)cp $< $(subst $(PRODUCT_DIR),$(OBJROOT),$<)
 	$(v)$(AS) $(ASFLAGS) $(subst $(PRODUCT_DIR),$(OBJROOT),$<)
 
-.PHONY:	upload
-upload:	$(PRODUCT_HEX)
-	@echo UPLOAD $<
-	$(v)$(EC2FLASH) $(EC2FLASH_ARGS) $<
-
 clean:
 	$(v)rm -rf $(OBJROOT)
 
diff --git a/Firmware/tools/upload b/Firmware/tools/upload
new file mode 100755
index 00000000..b3cb9b18
--- /dev/null
+++ b/Firmware/tools/upload
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Trivial uploader script, assumes that you have the EC2 tools somewhere on your path.
+#
+
+EWF=`which ec2writeflash`
+
+if [ -z $EWF ]; then
+	echo "Could not find ec2writeflash on your path - did you install the EC2 tools?"
+	exit 1
+fi
+if [ -z $1 ]; then
+	echo "Missing firmware filename."
+	exit 1
+fi
+if [ ! -r $1 ]; then
+	echo "Input file '$1' not readable."
+	exit 1
+fi
+
+${EWF} --port=USB --mode=c2 --run --hex $1