master merge fixes

2021-04-04 21:12:12 -07:00
parent c23c0fbe4c f8638602ef
commit 87888a9a93
27 changed files with 399 additions and 281 deletions
--- a/hw/rtl/cache/VX_cache.v
+++ b/hw/rtl/cache/VX_cache.v
@@ -168,8 +168,7 @@ module VX_cache #(
        .NUM_BANKS  (NUM_BANKS)
    ) flush_ctrl (
        .clk       (clk),
-        .reset     (reset),
-        .flush     (flush),        
+        .reset     (reset || flush),
        .addr_out  (flush_addr),
        .valid_out (flush_enable)
    );