move main.ut into Makefile

diff --git a/Makefile b/Makefile
index 9e8b284..5853c44 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -144,6 +144,28 @@ synth:
        echo -n " -slice_utilization_ratio_maxmargin 5" >> build/fpga/main.xst
        echo >> build/fpga/main.xst
 
+       rm -f build/fpga/main.ut
+       echo '-w' >> build/fpga/main.ut
+       echo '-g CclkPin:PULLUP' >> build/fpga/main.ut
+       echo '-g TdoPin:PULLNONE' >> build/fpga/main.ut
+       echo '-g M1Pin:PULLDOWN' >> build/fpga/main.ut
+       echo '-g DonePin:PULLUP' >> build/fpga/main.ut
+       echo '-g DriveDone:No' >> build/fpga/main.ut
+       echo '-g StartUpClk:JTAGCLK' >> build/fpga/main.ut
+       echo '-g DONE_cycle:4' >> build/fpga/main.ut
+       echo '-g GTS_cycle:5' >> build/fpga/main.ut
+       echo '-g M0Pin:PULLUP' >> build/fpga/main.ut
+       echo '-g M2Pin:PULLUP' >> build/fpga/main.ut
+       echo '-g ProgPin:PULLUP' >> build/fpga/main.ut
+       echo '-g TckPin:PULLUP' >> build/fpga/main.ut
+       echo '-g TdiPin:PULLUP' >> build/fpga/main.ut
+       echo '-g TmsPin:PULLUP' >> build/fpga/main.ut
+       echo '-g DonePipe:No' >> build/fpga/main.ut
+       echo '-g GWE_cycle:6' >> build/fpga/main.ut
+       echo '-g LCK_cycle:NoWait' >> build/fpga/main.ut
+       echo '-g Security:NONE' >> build/fpga/main.ut
+       echo '-g Persist:No' >> build/fpga/main.ut
+
        $(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 -cm area -intstyle xflow -p $(device) -pr b -ol high -o main_map.ncd main.ngd main.pcf

diff --git a/src/edu/berkeley/fleet/fpga/main.ut b/src/edu/berkeley/fleet/fpga/main.ut
deleted file mode 100644 (file)
index 4641f0d..0000000
--- a/src/edu/berkeley/fleet/fpga/main.ut
+++ /dev/null
@@ -1,21 +0,0 @@
--w
--g CclkPin:PULLUP
--g TdoPin:PULLNONE
--g M1Pin:PULLDOWN
--g DonePin:PULLUP
--g DriveDone:No
--g StartUpClk:JTAGCLK
--g DONE_cycle:4
--g GTS_cycle:5
--g M0Pin:PULLUP
--g M2Pin:PULLUP
--g ProgPin:PULLUP
--g TckPin:PULLUP
--g TdiPin:PULLUP
--g TmsPin:PULLUP
--g DonePipe:No
--g GWE_cycle:6
--g LCK_cycle:NoWait
--g Security:NONE
-#-m
--g Persist:No