diff --git a/cores/Apple2/build/make.bat b/cores/Apple2/build/make.bat index 8f90a72..4d127b6 100644 --- a/cores/Apple2/build/make.bat +++ b/cores/Apple2/build/make.bat @@ -1,16 +1,8 @@ -if not exist projnav.tmp mkdir projnav.tmp -call xst -intstyle ise -ifn APPLE2_TOP.xst -ofn APPLE2_TOP.syr -call :generar v2 -call :generar v3 -call :generar v4 -call :generar Ap -goto :eof - -:generar -call ngdbuild -intstyle ise -dd _ngo -nt timestamp -uc ..\source\apple2_zxuno_%1.ucf -p xc6slx9-tqg144-2 APPLE2_TOP.ngc APPLE2_TOP.ngd -call map -intstyle ise -w -ol high -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 APPLE2_TOP_map.ncd APPLE2_TOP.ngd APPLE2_TOP.pcf -call par -intstyle ise -w -ol high -mt 4 APPLE2_TOP_map.ncd APPLE2_TOP.ncd APPLE2_TOP.pcf -call trce -intstyle ise -v 3 -s 2 -n 3 -fastpaths -xml APPLE2_TOP.twx APPLE2_TOP.ncd -o APPLE2_TOP.twr APPLE2_TOP.pcf -call bitgen -intstyle ise -f APPLE2_TOP.ut APPLE2_TOP.ncd -copy /y apple2_top.bit Apple2.%1.bit -:eof \ No newline at end of file +SET machine=apple2_top +SET ruta_ucf=source\apple2 +SET ruta_bat=..\..\ +call %ruta_bat%genxst.bat +call %ruta_bat%generar.bat v2 +call %ruta_bat%generar.bat v3 +call %ruta_bat%generar.bat v4 +call %ruta_bat%generar.bat Ap diff --git a/cores/Apple2/source/pines_zxuno_Ap.ucf b/cores/Apple2/source/pines_zxuno_Ap.ucf deleted file mode 100644 index de59282..0000000 --- a/cores/Apple2/source/pines_zxuno_Ap.ucf +++ /dev/null @@ -1,91 +0,0 @@ -# Clocks & debug -NET "clk50mhz" LOC="P55" | IOSTANDARD = LVCMOS33 | PERIOD=20.0ns; -NET "testled" LOC="P2" | IOSTANDARD = LVCMOS33; - -# Video output -NET "r<2>" LOC="P97" | IOSTANDARD = LVCMOS33; -NET "r<1>" LOC="P95" | IOSTANDARD = LVCMOS33; -NET "r<0>" LOC="P94" | IOSTANDARD = LVCMOS33; -NET "g<2>" LOC="P88" | IOSTANDARD = LVCMOS33; -NET "g<1>" LOC="P87" | IOSTANDARD = LVCMOS33; -NET "g<0>" LOC="P85" | IOSTANDARD = LVCMOS33; -NET "b<2>" LOC="P84" | IOSTANDARD = LVCMOS33; -NET "b<1>" LOC="P83" | IOSTANDARD = LVCMOS33; -NET "b<0>" LOC="P82" | IOSTANDARD = LVCMOS33; -NET "hsync" LOC="P93" | IOSTANDARD = LVCMOS33; -NET "vsync" LOC="P92" | IOSTANDARD = LVCMOS33; -NET "stdn" LOC="P51" | IOSTANDARD = LVCMOS33; -NET "stdnb" LOC="P50" | IOSTANDARD = LVCMOS33; - -# Sound input/output -NET "audio_out_left" LOC="P98" | IOSTANDARD = LVCMOS33; -NET "audio_out_right" LOC="P99" | IOSTANDARD = LVCMOS33; -NET "ear" LOC="P1" | IOSTANDARD = LVCMOS33; - -# Keyboard and mouse -NET "clkps2" LOC="P143" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "dataps2" LOC="P142" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "mouseclk" LOC="P57" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "mousedata" LOC="P56" | IOSTANDARD = LVCMOS33 | PULLUP; - -# 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_addr<19>" LOC="P111" | IOSTANDARD = LVCMOS33; -#NET "sram_addr<20>" 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="P105" | IOSTANDARD = LVCMOS33; -NET "sram_data<4>" LOC="P104" | IOSTANDARD = LVCMOS33; -NET "sram_data<5>" LOC="P102" | IOSTANDARD = LVCMOS33; -NET "sram_data<6>" LOC="P101" | IOSTANDARD = LVCMOS33; -NET "sram_data<7>" LOC="P100" | 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="P78" | IOSTANDARD = LVCMOS33; -NET "sd_clk" LOC="P80" | IOSTANDARD = LVCMOS33; -NET "sd_mosi" LOC="P79" | IOSTANDARD = LVCMOS33; -NET "sd_miso" LOC="P81" | IOSTANDARD = LVCMOS33; - -# JOYSTICK -NET "joyup" LOC="P74" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joydown" LOC="P67" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joyleft" LOC="P59" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joyright" LOC="P58" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joyfire" LOC="P75" | IOSTANDARD = LVCMOS33 | PULLUP; -#NET "joyfire2" LOC="P8" | IOSTANDARD = LVCMOS33 | PULLUP; -#NET "joyfire3" LOC="P39" | IOSTANDARD = LVCMOS33 | PULLUP; - - -# Otros -NET "sysclk" PERIOD=35 ns; - diff --git a/cores/Apple2/source/pines_zxuno_v4.ucf b/cores/Apple2/source/pines_zxuno_v4.ucf deleted file mode 100644 index 747e025..0000000 --- a/cores/Apple2/source/pines_zxuno_v4.ucf +++ /dev/null @@ -1,91 +0,0 @@ -# Clocks & debug -NET "clk50mhz" LOC="P55" | IOSTANDARD = LVCMOS33 | PERIOD=20.0ns; -NET "testled" LOC="P11" | IOSTANDARD = LVCMOS33; - -# Video output -NET "r<2>" LOC="P81" | IOSTANDARD = LVCMOS33; -NET "r<1>" LOC="P80" | IOSTANDARD = LVCMOS33; -NET "r<0>" LOC="P79" | 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="P93" | IOSTANDARD = LVCMOS33; -NET "b<1>" LOC="P92" | IOSTANDARD = LVCMOS33; -NET "b<0>" LOC="P88" | IOSTANDARD = LVCMOS33; -NET "hsync" LOC="P87" | IOSTANDARD = LVCMOS33; -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; -NET "dataps2" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "mouseclk" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; - -# 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; -#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="P1" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joydown" LOC="P5" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joyleft" LOC="P6" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joyright" LOC="P7" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joyfire" LOC="P2" | IOSTANDARD = LVCMOS33 | PULLUP; -#NET "joyfire2" LOC="P8" | IOSTANDARD = LVCMOS33 | PULLUP; -#NET "joyfire3" LOC="P39" | IOSTANDARD = LVCMOS33 | PULLUP; - - -# Otros -NET "sysclk" PERIOD=35 ns; - diff --git a/cores/BBCMicro/working/make.bat b/cores/BBCMicro/working/make.bat index 6024c18..ee0b12c 100644 --- a/cores/BBCMicro/working/make.bat +++ b/cores/BBCMicro/working/make.bat @@ -1,17 +1,7 @@ SET machine=bbc_micro -if not exist projnav.tmp mkdir projnav.tmp -call xst -intstyle ise -ifn %machine%.xst -ofn %machine%.syr -call :generar v2 -call :generar v3 -call :generar v4 -call :generar Ap -goto :eof - -:generar -call ngdbuild -intstyle ise -dd _ngo -nt timestamp -uc ..\src\%machine%_zxuno_%1.ucf -p xc6slx9-tqg144-2 %machine%.ngc %machine%.ngd -call map -intstyle ise -w -ol high -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 %machine%_map.ncd %machine%.ngd %machine%.pcf -call par -intstyle ise -w -ol high -mt 4 %machine%_map.ncd %machine%.ncd %machine%.pcf -call trce -intstyle ise -v 3 -s 2 -n 3 -fastpaths -xml %machine%.twx %machine%.ncd -o %machine%.twr %machine%.pcf -call bitgen -intstyle ise -f %machine%.ut %machine%.ncd -copy /y %machine%.bit %machine%.%1.bit -:eof \ No newline at end of file +SET ruta_ucf=..\src\bbc_micro +SET ruta_bat=..\..\ +call %ruta_bat%genxst.bat +call %ruta_bat%generar.bat v2_v3 +call %ruta_bat%generar.bat v4 +call %ruta_bat%generar.bat Ap diff --git a/cores/JupiterAce/make.bat b/cores/JupiterAce/make.bat index 809d5db..6908566 100644 --- a/cores/JupiterAce/make.bat +++ b/cores/JupiterAce/make.bat @@ -1,7 +1,7 @@ SET machine=jupiter_ace SET ruta_ucf=jupiter_ace SET ruta_bat=..\ -call ..\genxst.bat -call ..\generar.bat v2_v3 -call ..\generar.bat v4 -call ..\generar.bat Ap +call %ruta_bat%genxst.bat +call %ruta_bat%generar.bat v2_v3 +call %ruta_bat%generar.bat v4 +call %ruta_bat%generar.bat Ap