projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
189e6e8
)
update program.sh and Makefile for new jtag setup
author
Adam Megacz
<adam@megacz.com>
Mon, 11 Jan 2010 01:53:18 +0000
(17:53 -0800)
committer
Adam Megacz
<adam@megacz.com>
Mon, 11 Jan 2010 01:53:18 +0000
(17:53 -0800)
Makefile
patch
|
blob
|
history
misc/program.sh
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
5637537
..
4b9fb4e
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-312,7
+312,7
@@
ifneq ($(impl),bee2)
endif
runserver: fleet.jar
- $(java) -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
+ $(java) -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
test: fleet.jar
$(java) -jar fleet.jar test ships/*.ship tests
diff --git
a/misc/program.sh
b/misc/program.sh
index
588b9f5
..
01fb7da
100755
(executable)
--- a/
misc/program.sh
+++ b/
misc/program.sh
@@
-1,5
+1,11
@@
#!/bin/bash
+jtag < misc/jtag-commands
+exit 0
+
+
+
+
export XILINX=/usr/local/xilinx/ise/