X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=62b79837560b2071e9992a6cbba491949cc85a2c;hb=2d7d6febd250fb551d0b614ba5895ab3a3552d58;hp=077fcf564d27555bf52360363e231d1204133ee3;hpb=962b74a05c48dd5d3d7722bef5886129167bab58;p=fleet.git diff --git a/Makefile b/Makefile index 077fcf5..62b7983 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ synth: 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/dvi/* . - #cd build/fpga; ln -sf ../../src/edu/berkeley/fleet/fpga/greg/* . + 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 @@ -356,7 +356,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