aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorajmeyer@mit.edu <ajmeyer@mit.edu@749a229e-a60e-11de-b98f-4500b42dc123>2010-02-12 20:57:45 +0000
committerajmeyer@mit.edu <ajmeyer@mit.edu@749a229e-a60e-11de-b98f-4500b42dc123>2010-02-12 20:57:45 +0000
commit966e4ac594494f02a62d34bb9446ce1ff07dc54b (patch)
tree6f99c8c8c2bca9f0ab5b21319abec3da26f1552e /Makefile
parent2826bbb424f15d61c5ef917dcfd5444e7e607b56 (diff)
downloadlibrambutan-966e4ac594494f02a62d34bb9446ce1ff07dc54b.tar.gz
librambutan-966e4ac594494f02a62d34bb9446ce1ff07dc54b.zip
modded the library makefile to work with patched dfu-util, also added the USER_FLASH section to the rom linker
git-svn-id: https://leaflabs.googlecode.com/svn/trunk/library@131 749a229e-a60e-11de-b98f-4500b42dc123
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 350d73e..4d3f54c 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,9 @@ AS := arm-none-eabi-as
CP := arm-none-eabi-objcopy
OD := arm-none-eabi-objdump
+#todo: use an OS switch here to grab a different bin
+DFU = ../dfu-util/bin/linux/dfu-util
+
BUILD_PATH = build
LIB_PATH = lib
COMM_PATH = comm
@@ -180,10 +183,10 @@ jtag: $(BUILD_PATH)/main.bin
@echo "JTAG build"
program_ram: ram
- dfu-util -a0 -d 0110:1001 -D build/main.bin -R
+ $(DFU) -a0 -d 0110:1001 -D build/main.bin -R
program_flash: flash
- dfu-util -a1 -d 0110:1001 -D build/main.bin -R
+ $(DFU) -a1 -d 0110:1001 -D build/main.bin -R
program_jtag: jtag
openocd -f stm32conf/flash.cfg