projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9ac0147
)
change build machine, use /usr/bin/tclsh instead of /usr/bin/tcl
master
author
Adam Megacz
<megacz@cs.berkeley.edu>
Mon, 18 Jan 2010 22:37:51 +0000
(14:37 -0800)
committer
Adam Megacz
<megacz@cs.berkeley.edu>
Mon, 18 Jan 2010 22:37:51 +0000
(14:37 -0800)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
3f393ba
..
16d18b8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-92,8
+92,8
@@
fleet.jar: upstream/sbp/edu.berkeley.sbp.jar $(java_files) $(ship_files) src/edu
## Fpga ####################################################################################
# 32Gb ram, 4-core. small-config:1019s large-config:2530s
## Fpga ####################################################################################
# 32Gb ram, 4-core. small-config:1019s large-config:2530s
-#host = intel2950-5.eecs.berkeley.edu
-host = intel2950-4.eecs.berkeley.edu
+host = intel2950-5.eecs.berkeley.edu
+#host = intel2950-4.eecs.berkeley.edu
# 128Gb ram, 2x4-core. small-config:1189s large-config:3065s
#host = amdr905-1.eecs.berkeley.edu
# 128Gb ram, 2x4-core. small-config:1189s large-config:3065s
#host = amdr905-1.eecs.berkeley.edu
@@
-306,7
+306,7
@@
ifneq ($(impl),bee2)
echo "quit" >> build/${impl}/impact.cmd
$(xilinx_ise)impact -batch < impact.cmd
echo "quit" >> build/${impl}/impact.cmd
$(xilinx_ise)impact -batch < impact.cmd
- $(xilinx) tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
+ $(xilinx) tclsh $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
mv build/${impl}/mainx.ace build/${impl}/main.ace # genace throws a fit if the filename prefix is the same?
endif
mv build/${impl}/mainx.ace build/${impl}/main.ace # genace throws a fit if the filename prefix is the same?
endif