fix paths for ISE, EDK

diff --git a/Makefile b/Makefile
index bd38909..4f2fd8f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
 
 host = intel2950-5.eecs.berkeley.edu
 remote_ise = /tools/xilinx/ISE9.1i_lin
-remote_edk = /tools/xilinx/EDK9.1i_lin
+remote_edk = /tools/xilinx/EDK9.1i
 remote_dir = /scratch/megacz/fleet/
 
 #host = mm2.millennium.berkeley.edu
@@ -46,7 +46,9 @@ xilinx += PATH=$$PATH:$(remote_ise)/bin/lin:$(remote_edk)/bin/lin
 xilinx += XST_VERSION=9.2i
 xilinx += XILINX=$(remote_ise)
 xilinx += XILINX_EDK=$(remote_edk)
-xilinx += $(remote_ise)/bin/lin/
+
+xilinx_ise = $(xilinx) $(remote_ise)/bin/lin/
+xilinx_edk = $(xilinx) $(remote_edk)/bin/lin/
 
 speed_grade = 11
 device = xc4vfx60ff1152-${speed_grade}
@@ -81,13 +83,13 @@ synth:
        cd build/fpga; mkdir -p xst
        rm -rf build/fpga/_ngo
        skill xst_original
-       $(xilinx)xst -intstyle xflow -ifn main.xst -ofn main.syr < main.xst
-       $(xilinx)ngdbuild -aul -intstyle xflow -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
-       $(xilinx)map -intstyle xflow -p $(device) -pr b -ol std -o main_map.ncd main.ngd main.pcf
-       $(xilinx)par -w -intstyle xflow -t 99 -pl std -rl std main_map.ncd main.ncd main.pcf
-       $(xilinx)bitgen -intstyle xflow -d -f main.ut main.ncd
-#      $(xilinx)trce -intstyle xflow -e 3 -l 3 -s ${speed_grade} -xml main main.ncd -o main.twr main.pcf
-       $(xilinx)xmd -tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ml410 -ace main.ace
+       $(xilinx_ise)xst -intstyle xflow -ifn main.xst -ofn main.syr < main.xst
+       $(xilinx_ise)ngdbuild -aul -intstyle xflow -dd _ngo -nt timestamp -uc main.ucf -p $(device) main.ngc main.ngd
+       $(xilinx_ise)map -intstyle xflow -p $(device) -pr b -ol std -o main_map.ncd main.ngd main.pcf
+       $(xilinx_ise)par -w -intstyle xflow -t 99 -pl std -rl std main_map.ncd main.ncd main.pcf
+       $(xilinx_ise)bitgen -intstyle xflow -d -f main.ut main.ncd
+#      $(xilinx_ise)trce -intstyle xflow -e 3 -l 3 -s ${speed_grade} -xml main main.ncd -o main.twr main.pcf
+       $(xilinx_edk)xmd -tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ml410 -ace main.ace
 
 
 runserver: fleet.jar