X-Git-Url: http://git.megacz.com/?p=fleet.git;a=blobdiff_plain;f=Makefile;h=16d18b8745e50afba1cbae5350ccc52002e3228f;hp=3f393baa59c6ef916d5d0b02c0ee4ae7917498cd;hb=e9da0e0ffcb28972a55e7e4a6d30aeaf2779dad8;hpb=9ac0147c83d09ac097acdef331823b8edb9e649d diff --git a/Makefile b/Makefile index 3f393ba..16d18b8 100644 --- 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 -#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 @@ -306,7 +306,7 @@ ifneq ($(impl),bee2) 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