X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=cd0e3d03b3185d71989ac39f3b6679f8b775d9e9;hb=4990447485393a2e57505ba9ca60fed8fa14e68e;hp=62b79837560b2071e9992a6cbba491949cc85a2c;hpb=37684cbca9bf8eda37fe7af3845cf135f66aafdf;p=fleet.git

diff --git a/Makefile b/Makefile
index 62b7983..cd0e3d0 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ build/fpga/main.bit: $(java_files) $(ship_files)
 	rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
 	time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_ise} remote_ise=${remote_ise} remote_edk=${remote_edk}'
 	scp ${host}:${remote_dir}/build/fpga/main.bit build/fpga/
+	scp ${host}:${remote_dir}/build/fpga/main.ace build/fpga/
 
 pcore = ${remote_edk}/hw/XilinxProcessorIPLib/pcores
 intstyle = -intstyle xflow
@@ -217,8 +218,8 @@ synth:
 	$(xilinx_ise)par      ${intstyle} -pl ${effort} -ol ${effort} -w main_map.ncd main.ncd main.pcf
 	$(xilinx_ise)trce     ${intstyle} -e 3 -l 3 -s ${speed_grade} -xml main main.ncd -o main.twr main.pcf
 	$(xilinx_ise)bitgen   ${intstyle} -f main.ut main.ncd
-#	$(xilinx_edk)xmd -tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
-#	mv build/fpga/mainx.ace build/fpga/main.ace   # genace throws a fit if the filename prefix is the same?
+	$(xilinx) tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
+	mv build/fpga/mainx.ace build/fpga/main.ace   # genace throws a fit if the filename prefix is the same?
 
 
 runserver: fleet.jar