From 832423579d60534ccc63b3f761d17bc47a6498e5 Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Fri, 8 Jul 2016 10:53:36 +0200 Subject: [PATCH] Ya compilan los 9 cores --- cores/Apple2/build/make.bat | 4 ++-- cores/BBCMicro/working/make.bat | 2 +- cores/NES/src/nes_zxuno_v4.ucf | 4 ++-- firmware/generamcs.bat | 2 +- firmware/generamcs_multi.bat | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cores/Apple2/build/make.bat b/cores/Apple2/build/make.bat index 3e7370d..c84aec7 100644 --- a/cores/Apple2/build/make.bat +++ b/cores/Apple2/build/make.bat @@ -1,6 +1,6 @@ SET machine=apple2_top -SET speed=3 -SET ruta_ucf=source\apple2 +SET speed=2 +SET ruta_ucf=..\source\apple2 SET ruta_bat=..\..\ call %ruta_bat%genxst.bat rem call %ruta_bat%generar.bat v2 diff --git a/cores/BBCMicro/working/make.bat b/cores/BBCMicro/working/make.bat index 6e9f11d..92640a3 100644 --- a/cores/BBCMicro/working/make.bat +++ b/cores/BBCMicro/working/make.bat @@ -1,5 +1,5 @@ SET machine=bbc_micro -SET speed=3 +SET speed=2 SET ruta_ucf=..\src\bbc_micro SET ruta_bat=..\..\ call %ruta_bat%genxst.bat diff --git a/cores/NES/src/nes_zxuno_v4.ucf b/cores/NES/src/nes_zxuno_v4.ucf index ad16a66..15cd6ba 100644 --- a/cores/NES/src/nes_zxuno_v4.ucf +++ b/cores/NES/src/nes_zxuno_v4.ucf @@ -23,8 +23,8 @@ NET "AUDIO_R" LOC="P9" | IOSTANDARD = LVCMOS33; #NET "ear" LOC="P94" | IOSTANDARD = LVCMOS33; # Keyboard and mouse -NET "PS2_CLK" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "PS2_DAT" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "PS2_CLK" LOC="P99" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "PS2_DAT" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mouseclk" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; diff --git a/firmware/generamcs.bat b/firmware/generamcs.bat index f53541a..6a4e1eb 100644 --- a/firmware/generamcs.bat +++ b/firmware/generamcs.bat @@ -1,4 +1,4 @@ -rem call generamcs_multi 1 Ap ZZA +rem call generamcs_multi 1 Ap ZXA rem call generamcs_multi 2 v2 ZZ2 rem call generamcs_multi 3 v3 ZZ3 call generamcs_multi 4 v4 ZX1 diff --git a/firmware/generamcs_multi.bat b/firmware/generamcs_multi.bat index 52ee6bb..95157c5 100644 --- a/firmware/generamcs_multi.bat +++ b/firmware/generamcs_multi.bat @@ -13,12 +13,12 @@ GenRom sm1ta Machine tmp.bin core_taps\SPECTRUM.TAP rem CgLeches core_taps\SPECTRUM.TAP core_wavs\SPECTRUM.WAV 3 call :CreateMachine CORE2 "Sam Coupe" SamCoupe\tld_sam.%2.bit 0 %3 call :CreateMachine CORE3 "Jupiter ACE" JupiterAce\jupiter_ace.%2.bit JupiterAce\jupiter_ace.v2_v3.bit %3 -call :CreateMachine CORE4 "Master System" ..\..\zxuno\cores\sms_v2_spartan6\test4\sms_final_v4.bit 0 %3 -call :CreateMachine CORE5 "Oric Atmos" ..\..\zxuno\cores\oric_spartan6\test1\build\oric_v4.bit \zxuno\cores\oric_spartan6\test1\build\oric.bit %3 -call :CreateMachine CORE6 "BBC Micro" ..\..\zxuno\cores\BBCMicro\test3\working\bbc_micro_%2.bit 0 %3 -call :CreateMachine CORE7 "Apple 2 (VGA)" ..\..\zxuno\cores\Apple2_spartan6\test2\build\apple2_top_%2.bit 0 %3 -call :CreateMachine CORE8 "Acorn Atom (VGA)" ..\..\zxuno\cores\acorn_atom_spartan6\test2\working\atomic_top_zxuno_%2.bit 0 %3 -call :CreateMachine CORE9 "NES (VGA)" NES\xilinx\nes_zxuno.%2.bit 0 %3 +call :CreateMachine CORE4 "Master System" MasterSystem\sms.%2.bit 0 %3 +call :CreateMachine CORE5 "Oric Atmos" Oric\build\oric.%2.bit Oric\build\oric.v2_v3.bit %3 +call :CreateMachine CORE6 "BBC Micro" BBCMicro\working\bbc_micro.%2.bit BBCMicro\working\bbc_micro.v2_v3.bit %3 +call :CreateMachine CORE7 "Apple 2 (VGA)" Apple2\build\apple2_top.%2.bit 0 %3 +call :CreateMachine CORE8 "Acorn Atom (VGA)" AcornAtom\working\Atomic_top_zxuno.%2.bit 0 %3 +call :CreateMachine CORE9 "NES (VGA)" NES\xilinx\NES_ZXUNO.%2.bit 0 %3 copy /y rom_binaries\esxdos.rom sd_binaries\ESXDOS.%3 copy /y firmware.rom sd_binaries\FIRMWARE.%3 GenRom sm1t BIOS firmware.rom core_taps\FIRMWARE.TAP