X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=cc8f8d7c1b75d704295da978191f04e72e73fa7f;hb=8b1a948e7dd11e188ccbed082791aec6338196f9;hp=b12d896f90068a2d3010aec9b85cfeddfff63bc7;hpb=6d15c31019a007546cbbf6ed516030062d67fb0d;p=fleet.git

diff --git a/Makefile b/Makefile
index b12d896..cc8f8d7 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,13 @@ ship_files = $(shell find ships -name \*.ship)
 fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
 	mkdir -p build/class/edu/berkeley/fleet/assembler/
 	cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
-	javac -classpath lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+	javac -classpath lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
 	cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
+	cd build/class/; jar xf ../../lib/ibex.jar
 	for A in `find ships -name \*.ship`;\
 	  do java -cp fleet.jar:build/class edu.berkeley.fleet.Main expand $$A;\
 	  done
-	javac -classpath lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+	javac -classpath lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
 	echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
 	jar cmf build/class/manifest $@ ships -C build/class .
 
@@ -101,22 +102,25 @@ 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
-#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/* .
 	cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/ddr2/* .
-	#cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/greg/* .
+	cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/dvi/* .
+	cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/zbt/* .
 	rm -f build/fpga/main.lso
 	echo work                        >> build/fpga/main.lso
 	rm -f build/fpga/main.prj
 	cd build/fpga; for A in *.v;   do echo verilog work \""$$A"\"; done >> main.prj
+	cd build/fpga; for A in *.vhd; do echo vhdl    work \""$$A"\"; done >> main.prj
 	cd build/fpga; touch main.ini
 	cd build/fpga; mkdir -p tmp
 	cd build/fpga; mkdir -p xst
@@ -211,11 +215,11 @@ synth:
 	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
-#	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
@@ -353,7 +357,7 @@ runtest: fleet.jar
 	cp lib/suncvs.jar suncvs/marina/testCode/MarinaTest.jar
 	ssh ${sun_server} 'skill nanosim'
 	rsync -are ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
-	ssh -Y ${sun_server} 'export PATH=/proj/async/cad/linux/bin/:$$PATH; cd ~/fleet/suncvs/marina/testCode; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 1006'
+	ssh -Y ${sun_server} 'export PATH=/proj/async/cad/linux/bin/:$$PATH; cd ~/fleet/suncvs/marina/testCode; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3'
 
 electric:
 	rsync -are ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testSims/marina.spi.out ~/marina.spi.out