From 39ad89dad473e9e4a7db2530d8415a5423b44a42 Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Sat, 30 Apr 2016 18:07:56 +0200 Subject: [PATCH] Actualizo make.bat para que genere todos los bitstreams --- cores/Spectrum/make.bat | 14 ++++- cores/Spectrum/pines_zxuno.ucf | 85 ------------------------------- cores/Spectrum/pines_zxuno_v2.ucf | 84 ++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 87 deletions(-) delete mode 100644 cores/Spectrum/pines_zxuno.ucf create mode 100644 cores/Spectrum/pines_zxuno_v2.ucf diff --git a/cores/Spectrum/make.bat b/cores/Spectrum/make.bat index 7a18687..4da43ee 100644 --- a/cores/Spectrum/make.bat +++ b/cores/Spectrum/make.bat @@ -1,6 +1,16 @@ +if not exist projnav.tmp mkdir projnav.tmp call xst -intstyle ise -ifn tld_zxuno.xst -ofn tld_zxuno.syr -call ngdbuild -intstyle ise -dd _ngo -nt timestamp -uc pines_zxuno.ucf -p xc6slx9-tqg144-2 tld_zxuno.ngc tld_zxuno.ngd +call :generar v2 +call :generar v3 +call :generar v4 +call :generar Ap +goto :eof + +:generar +call ngdbuild -intstyle ise -dd _ngo -nt timestamp -uc pines_zxuno_%1.ucf -p xc6slx9-tqg144-2 tld_zxuno.ngc tld_zxuno.ngd call map -intstyle ise -w -ol high -xe n -mt 2 -p xc6slx9-tqg144-2 -logic_opt off -t 1 -xt 0 -register_duplication off -r 4 -global_opt off -ir off -pr off -lc off -power off -o tld_zxuno_map.ncd tld_zxuno.ngd tld_zxuno.pcf call par -intstyle ise -w -ol high -xe n -mt 4 tld_zxuno_map.ncd tld_zxuno.ncd tld_zxuno.pcf -call trce -intstyle ise -v 3 -s 2 -n 3 -fastpaths -xml tld_zxuno.twx tld_zxuno.ncd -o tld_zxuno.twr tld_zxuno.pcf -ucf pines_zxuno.ucf +call trce -intstyle ise -v 3 -s 2 -n 3 -fastpaths -xml tld_zxuno.twx tld_zxuno.ncd -o tld_zxuno.twr tld_zxuno.pcf -ucf pines_zxuno_%1.ucf call bitgen -intstyle ise -w -g Binary:no -g Compress -g CRC:Enable -g Reset_on_err:No -g ConfigRate:2 -g ProgPin:PullUp -g TckPin:PullUp -g TdiPin:PullUp -g TdoPin:PullUp -g TmsPin:PullUp -g UnusedPin:PullDown -g UserID:0xFFFFFFFF -g ExtMasterCclk_en:Yes -g ExtMasterCclk_divide:50 -g SPI_buswidth:1 -g TIMER_CFG:0xFFFF -g multipin_wakeup:No -g StartUpClk:CClk -g DONE_cycle:4 -g GTS_cycle:5 -g GWE_cycle:6 -g LCK_cycle:NoWait -g Security:None -g DonePipe:No -g DriveDone:No -g en_sw_gsr:No -g drive_awake:No -g sw_clk:Startupclk -g sw_gwe_cycle:5 -g sw_gts_cycle:4 tld_zxuno.ncd +copy /y tld_zxuno.bit zxuno.%1.bit +:eof \ No newline at end of file diff --git a/cores/Spectrum/pines_zxuno.ucf b/cores/Spectrum/pines_zxuno.ucf deleted file mode 100644 index 10ecc30..0000000 --- a/cores/Spectrum/pines_zxuno.ucf +++ /dev/null @@ -1,85 +0,0 @@ -# Clocks & debug -NET "clk50mhz" LOC="P55" | IOSTANDARD = LVCMOS33; -NET "testled" LOC="P11" | IOSTANDARD = LVCMOS33; -NET "clk50mhz" PERIOD=20 ns; -NET "sysclk" PERIOD=35 ns; - -# Video output -NET "b<2>" LOC="P93" | IOSTANDARD = LVCMOS33; -NET "b<1>" LOC="P92" | IOSTANDARD = LVCMOS33; -NET "b<0>" LOC="P88" | IOSTANDARD = LVCMOS33; -NET "g<2>" LOC="P84" | IOSTANDARD = LVCMOS33; -NET "g<1>" LOC="P83" | IOSTANDARD = LVCMOS33; -NET "g<0>" LOC="P82" | IOSTANDARD = LVCMOS33; -NET "r<2>" LOC="P81" | IOSTANDARD = LVCMOS33; -NET "r<1>" LOC="P80" | IOSTANDARD = LVCMOS33; -NET "r<0>" LOC="P79" | IOSTANDARD = LVCMOS33; -NET "hsync" LOC="P87" | IOSTANDARD = LVCMOS33; #87 -NET "vsync" LOC="P85" | IOSTANDARD = LVCMOS33; -NET "stdn" LOC="P66" | IOSTANDARD = LVCMOS33; -NET "stdnb" LOC="P67" | IOSTANDARD = LVCMOS33; - -# Sound input/output -NET "audio_out_left" LOC="P10" | IOSTANDARD = LVCMOS33; -NET "audio_out_right" LOC="P9" | IOSTANDARD = LVCMOS33; -NET "ear" LOC="P94" | IOSTANDARD = LVCMOS33; - -# Keyboard and mouse -NET "clkps2" LOC="P99" | IOSTANDARD = LVCMOS33 | PULLUP; # pin 1 DIN -NET "dataps2" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; # pin 5 DIN -NET "mouseclk" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; # pin 6 DIN -NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; # pin 2 DIN - -# SRAM -NET "sram_addr<0>" LOC="P141" | IOSTANDARD = LVCMOS33; -NET "sram_addr<1>" LOC="P139" | IOSTANDARD = LVCMOS33; -NET "sram_addr<2>" LOC="P137" | IOSTANDARD = LVCMOS33; -NET "sram_addr<3>" LOC="P134" | IOSTANDARD = LVCMOS33; -NET "sram_addr<4>" LOC="P133" | IOSTANDARD = LVCMOS33; -NET "sram_addr<5>" LOC="P120" | IOSTANDARD = LVCMOS33; -NET "sram_addr<6>" LOC="P118" | IOSTANDARD = LVCMOS33; -NET "sram_addr<7>" LOC="P116" | IOSTANDARD = LVCMOS33; -NET "sram_addr<8>" LOC="P114" | IOSTANDARD = LVCMOS33; -NET "sram_addr<9>" LOC="P112" | IOSTANDARD = LVCMOS33; -NET "sram_addr<10>" LOC="P104" | IOSTANDARD = LVCMOS33; -NET "sram_addr<11>" LOC="P102" | IOSTANDARD = LVCMOS33; -NET "sram_addr<12>" LOC="P101" | IOSTANDARD = LVCMOS33; -NET "sram_addr<13>" LOC="P100" | IOSTANDARD = LVCMOS33; -NET "sram_addr<14>" LOC="P111" | IOSTANDARD = LVCMOS33; -NET "sram_addr<15>" LOC="P131" | IOSTANDARD = LVCMOS33; -NET "sram_addr<16>" LOC="P138" | IOSTANDARD = LVCMOS33; -NET "sram_addr<17>" LOC="P140" | IOSTANDARD = LVCMOS33; -NET "sram_addr<18>" LOC="P142" | IOSTANDARD = LVCMOS33; -#NET "sram_addr<19>" LOC="P105" | IOSTANDARD = LVCMOS33; -#NET "sram_addr<20>" LOC="P143" | IOSTANDARD = LVCMOS33; - -NET "sram_data<0>" LOC="P132" | IOSTANDARD = LVCMOS33; -NET "sram_data<1>" LOC="P127" | IOSTANDARD = LVCMOS33; -NET "sram_data<2>" LOC="P124" | IOSTANDARD = LVCMOS33; -NET "sram_data<3>" LOC="P123" | IOSTANDARD = LVCMOS33; -NET "sram_data<4>" LOC="P115" | IOSTANDARD = LVCMOS33; -NET "sram_data<5>" LOC="P117" | IOSTANDARD = LVCMOS33; -NET "sram_data<6>" LOC="P119" | IOSTANDARD = LVCMOS33; -NET "sram_data<7>" LOC="P126" | IOSTANDARD = LVCMOS33; - -NET "sram_we_n" LOC="P121" | IOSTANDARD = LVCMOS33; - -# SPI Flash -NET "flash_cs_n" LOC="P38" | IOSTANDARD = LVCMOS33; -NET "flash_clk" LOC="P70" | IOSTANDARD = LVCMOS33; -NET "flash_mosi" LOC="P64" | IOSTANDARD = LVCMOS33; -NET "flash_miso" LOC="P65" | IOSTANDARD = LVCMOS33; - -# SD/MMC -NET "sd_cs_n" LOC="P59" | IOSTANDARD = LVCMOS33; -NET "sd_clk" LOC="P75" | IOSTANDARD = LVCMOS33; -NET "sd_mosi" LOC="P74" | IOSTANDARD = LVCMOS33; -NET "sd_miso" LOC="P78" | IOSTANDARD = LVCMOS33; - -# JOYSTICK -NET "joyup" LOC="P1" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY6 -NET "joydown" LOC="P5" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY4 -NET "joyleft" LOC="P6" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY3 -NET "joyright" LOC="P7" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY2 -NET "joyfire" LOC="P2" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY7 -#NET "btn2" LOC="P8" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY5 diff --git a/cores/Spectrum/pines_zxuno_v2.ucf b/cores/Spectrum/pines_zxuno_v2.ucf new file mode 100644 index 0000000..c7ebcb8 --- /dev/null +++ b/cores/Spectrum/pines_zxuno_v2.ucf @@ -0,0 +1,84 @@ +# Clocks & debug +NET "clk50mhz" LOC="P55" | IOSTANDARD = LVCMOS33; +NET "testled" LOC="P10" | IOSTANDARD = LVCMOS33; +NET "clk50mhz" PERIOD=20 ns; +NET "sysclk" PERIOD=35 ns; + +# Video output +NET "r<2>" LOC="P93" | IOSTANDARD = LVCMOS33; +NET "r<1>" LOC="P92" | IOSTANDARD = LVCMOS33; +NET "r<0>" LOC="P88" | IOSTANDARD = LVCMOS33; +NET "g<2>" LOC="P84" | IOSTANDARD = LVCMOS33; +NET "g<1>" LOC="P83" | IOSTANDARD = LVCMOS33; +NET "g<0>" LOC="P82" | IOSTANDARD = LVCMOS33; +NET "b<2>" LOC="P81" | IOSTANDARD = LVCMOS33; +NET "b<1>" LOC="P80" | IOSTANDARD = LVCMOS33; +NET "b<0>" LOC="P79" | IOSTANDARD = LVCMOS33; +NET "hsync" LOC="P87" | IOSTANDARD = LVCMOS33; +NET "vsync" LOC="P85" | IOSTANDARD = LVCMOS33; +NET "stdn" LOC="P67" | IOSTANDARD = LVCMOS33; +NET "stdnb" LOC="P66" | IOSTANDARD = LVCMOS33; + +# Sound input/output +NET "audio_out_left" LOC="P8" | IOSTANDARD = LVCMOS33; +NET "audio_out_right" LOC="P9" | IOSTANDARD = LVCMOS33; +NET "ear" LOC="P105" | IOSTANDARD = LVCMOS33; + +# Keyboard and mouse +NET "clkps2" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; # pin 1 DIN +NET "dataps2" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; # pin 5 DIN +NET "mouseclk" LOC="P94" | IOSTANDARD = LVCMOS33 | PULLUP; # pin 6 DIN +NET "mousedata" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; # pin 2 DIN + +# SRAM +NET "sram_addr<0>" LOC="P115" | IOSTANDARD = LVCMOS33; +NET "sram_addr<1>" LOC="P116" | IOSTANDARD = LVCMOS33; +NET "sram_addr<2>" LOC="P117" | IOSTANDARD = LVCMOS33; +NET "sram_addr<3>" LOC="P119" | IOSTANDARD = LVCMOS33; +NET "sram_addr<4>" LOC="P120" | IOSTANDARD = LVCMOS33; +NET "sram_addr<5>" LOC="P123" | IOSTANDARD = LVCMOS33; +NET "sram_addr<6>" LOC="P126" | IOSTANDARD = LVCMOS33; +NET "sram_addr<7>" LOC="P131" | IOSTANDARD = LVCMOS33; +NET "sram_addr<8>" LOC="P127" | IOSTANDARD = LVCMOS33; +NET "sram_addr<9>" LOC="P124" | IOSTANDARD = LVCMOS33; +NET "sram_addr<10>" LOC="P118" | IOSTANDARD = LVCMOS33; +NET "sram_addr<11>" LOC="P121" | IOSTANDARD = LVCMOS33; +NET "sram_addr<12>" LOC="P133" | IOSTANDARD = LVCMOS33; +NET "sram_addr<13>" LOC="P132" | IOSTANDARD = LVCMOS33; +NET "sram_addr<14>" LOC="P137" | IOSTANDARD = LVCMOS33; +NET "sram_addr<15>" LOC="P140" | IOSTANDARD = LVCMOS33; +NET "sram_addr<16>" LOC="P139" | IOSTANDARD = LVCMOS33; +NET "sram_addr<17>" LOC="P141" | IOSTANDARD = LVCMOS33; +NET "sram_addr<18>" LOC="P138" | IOSTANDARD = LVCMOS33; + +NET "sram_data<0>" LOC="P114" | IOSTANDARD = LVCMOS33; +NET "sram_data<1>" LOC="P112" | IOSTANDARD = LVCMOS33; +NET "sram_data<2>" LOC="P111" | IOSTANDARD = LVCMOS33; +NET "sram_data<3>" LOC="P99" | IOSTANDARD = LVCMOS33; +NET "sram_data<4>" LOC="P100" | IOSTANDARD = LVCMOS33; +NET "sram_data<5>" LOC="P101" | IOSTANDARD = LVCMOS33; +NET "sram_data<6>" LOC="P102" | IOSTANDARD = LVCMOS33; +NET "sram_data<7>" LOC="P104" | IOSTANDARD = LVCMOS33; + +NET "sram_we_n" LOC="P134" | IOSTANDARD = LVCMOS33; + +# SPI Flash +NET "flash_cs_n" LOC="P38" | IOSTANDARD = LVCMOS33; +NET "flash_clk" LOC="P70" | IOSTANDARD = LVCMOS33; +NET "flash_mosi" LOC="P64" | IOSTANDARD = LVCMOS33; +NET "flash_miso" LOC="P65" | IOSTANDARD = LVCMOS33; +#NET "flash_ext1" LOC="P62" | IOSTANDARD = LVCMOS33; +#NET "flash_ext2" LOC="P61" | IOSTANDARD = LVCMOS33; + +# SD/MMC +NET "sd_cs_n" LOC="P59" | IOSTANDARD = LVCMOS33; +NET "sd_clk" LOC="P75" | IOSTANDARD = LVCMOS33; +NET "sd_mosi" LOC="P74" | IOSTANDARD = LVCMOS33; +NET "sd_miso" LOC="P78" | IOSTANDARD = LVCMOS33; + +# JOYSTICK +NET "joyup" LOC="P142" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY6 +NET "joydown" LOC="P1" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY4 +NET "joyleft" LOC="P2" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY3 +NET "joyright" LOC="P5" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY2 +NET "joyfire" LOC="P143" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY7 \ No newline at end of file