From: megacz <adam@megacz.com>
Date: Wed, 11 Mar 2009 22:32:51 +0000 (-0700)
Subject: change effort level back to std and opt_for back to area
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=962b74a05c48dd5d3d7722bef5886129167bab58;p=fleet.git

change effort level back to std and opt_for back to area
---

diff --git a/Makefile b/Makefile
index 6d99fce..077fcf5 100644
--- a/Makefile
+++ b/Makefile
@@ -104,10 +104,10 @@ build/fpga/main.bit: $(java_files) $(ship_files)
 
 pcore = ${remote_edk}/hw/XilinxProcessorIPLib/pcores
 intstyle = -intstyle xflow
-#effort = std
-effort = high
-#opt_for = area
-opt_for = speed
+effort = std
+#effort = high
+opt_for = area
+#opt_for = speed
 synth:
 	cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/* .
 	cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/mem/* .
@@ -210,10 +210,11 @@ synth:
 	  | grep --line-buffered -v 'been backward balanced into' \
 	  | grep --line-buffered -v 'IDDR has been replaced by IDDR_2CLK' \
 	  | grep --line-buffered -v 'WARNING:Xst:616 - Invalid property'
+	#rm build/fpga/dvi.ucf
 	cat build/fpga/*.ucf > build/fpga/main.ucf
 	$(xilinx_ise)ngdbuild ${intstyle} -aul -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
 	$(xilinx_ise)map      ${intstyle} -ol ${effort} -p $(device) -pr b -cm ${opt_for} -o main_map.ncd main.ngd main.pcf
-	$(xilinx_ise)par      ${intstyle} -pl high -ol ${effort} -w main_map.ncd main.ncd main.pcf
+	$(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