diff --git a/.gitignore b/.gitignore index d1492d3..2948b18 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,12 @@ software/asm/*.obj db/ incremental_db/ vip.sopcinfo +jtag.cdf +output_files/ +zpu/build/ +zpu/cpu/zpu_core_evo.vhd..2 +zpu/cpu/zpu_core_evo.vhd.1 +zpu/cpu/zpu_core_evo.vhd.bakPreMultChange +zpu/devices/WishBone/ +zpu/devices/sysbus/SDRAM.bak/ + diff --git a/build_id.v b/build_id.v index 87f2989..fd7cb77 100644 --- a/build_id.v +++ b/build_id.v @@ -1,2 +1,2 @@ -`define BUILD_DATE "200505" -`define BUILD_TIME "234608" +`define BUILD_DATE "200510" +`define BUILD_TIME "113233" diff --git a/mz80b/mz80b.vhd b/mz80b/mz80b.vhd index 6eb05bc..20732f2 100644 --- a/mz80b/mz80b.vhd +++ b/mz80b/mz80b.vhd @@ -615,14 +615,11 @@ begin if CLKBUS(CKENCPU) = '1' then + -- Only a boot reset or BST_n can set the BOOTSTRAP signal. A system reset just + -- resets the cpu and peripherals. + -- if CONFIG(BOOT_RESET) = '1' or BST_n = '0' then - -- Only a boot reset or BST_n can set the BOOTSTRAP signal. A system reset just - -- resets the cpu and peripherals. - -- - if CONFIG(BOOT_RESET) = '1' or BST_n = '0' then - BOOTSTRAP_n <= '0'; - end if; - + BOOTSTRAP_n <= '0'; else -- If the NST signal goes high, then reset the BOOTSTRAP signal. This signal can only be set -- by a reset action.