From d44f856baffd72742d2287f75df5c2c5dff07a73 Mon Sep 17 00:00:00 2001
From: AJM <poslathian@poslathian.(none)>
Date: Fri, 21 May 2010 19:09:35 -0400
Subject: Finalized the libmaple changes required by newboot. Added setupUSB()
 to wirish init

this involved some some changes to copy-to-ide, WProgram.h, and the makefile. Separated the reset.py from the wait.py so that the program closes the serial port correctly.
---
 Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 379013c..b85e28e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,9 @@ OD  := arm-none-eabi-objdump
 ARCH = $(shell uname -m)
 OS = $(shell uname)
 
+VENDOR_ID =  1EAF
+PRODUCT_ID = 0003
+
 ifeq ($(OS),Linux)
 	DFU = dfu-util
 else
@@ -195,11 +198,13 @@ jtag: $(BUILD_PATH)/main.bin
 	@echo "JTAG build"
 
 program_ram: ram 
-#	./reset.py
-	$(DFU) -a0 -d 0110:1001 -D build/main.bin -R
+	./reset.py
+	./wait.py
+	$(DFU) -a0 -d $(VENDOR_ID):$(PRODUCT_ID) -D build/main.bin -R
 
 program_flash: flash
 	./reset.py
+	./wait.py
 	$(DFU) -a1 -d 0110:1001 -D build/main.bin -R
 
 program_jtag: jtag
-- 
cgit v1.2.3