projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
68d6dbb
)
update Makefile to use intel2950-4.eecs.berkeley.edu
author
adam
<adam@megacz.com>
Fri, 25 Jan 2008 02:58:28 +0000
(
03:58
+0100)
committer
adam
<adam@megacz.com>
Fri, 25 Jan 2008 02:58:28 +0000
(
03:58
+0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
0a6cd9e
..
df5384b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-31,7
+31,7
@@
fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src
#remote_xilinx = /opt/ISE81/
#remote_dir = fleet/
#remote_xilinx = /opt/ISE81/
#remote_dir = fleet/
-host = intel2950-5.eecs.berkeley.edu
+host = intel2950-4.eecs.berkeley.edu
remote_xilinx = /scratch/megacz/xilinx/
remote_dir = /scratch/megacz/fleet/
remote_xilinx = /scratch/megacz/xilinx/
remote_dir = /scratch/megacz/fleet/
@@
-69,9
+69,9
@@
upload: fleet.jar build/fpga/main.bit
uploadtest:
make upload
uploadtest:
make upload
- $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests
+ $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship
testmegacz:
testmegacz:
- $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests
+ $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship
build/fpga/fabric.v: $(verilog_files) src/edu/berkeley/fleet/fpga/Fpga.java
make fleet.jar
build/fpga/fabric.v: $(verilog_files) src/edu/berkeley/fleet/fpga/Fpga.java
make fleet.jar
@@
-105,8
+105,8
@@
synth:
-test: fleet.jar; $(java) -jar fleet.jar test ships/*.ship tests
-testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
+test: fleet.jar; $(java) -jar fleet.jar test tests ships/*.ship
+testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test tests ships/*.ship
generate: fleet.jar
$(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/
generate: fleet.jar
$(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/