aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAJM <poslathian@poslathian.(none)>2010-05-21 19:09:35 -0400
committerAJM <poslathian@poslathian.(none)>2010-05-21 19:09:35 -0400
commitd44f856baffd72742d2287f75df5c2c5dff07a73 (patch)
treebaff10ec1752b750c8e595054824cfd08ab4256e /Makefile
parent7ee6a800d97e2dfeb5cbc4041df431941648b512 (diff)
downloadlibrambutan-d44f856baffd72742d2287f75df5c2c5dff07a73.tar.gz
librambutan-d44f856baffd72742d2287f75df5c2c5dff07a73.zip
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
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