From 728cbf96dfe44fafd7140ed01ec64978fd26b31c Mon Sep 17 00:00:00 2001
From: Michael Rogenmoser <michael@rogenmoser.us>
Date: Wed, 7 Aug 2024 16:43:38 +0200
Subject: [PATCH] Fix defaults

---
 src/axi_memory_island_wrap.sv         |  2 +-
 test/synth/axi_memory_island_synth.sv | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/axi_memory_island_wrap.sv b/src/axi_memory_island_wrap.sv
index c7c5c35..a73c055 100644
--- a/src/axi_memory_island_wrap.sv
+++ b/src/axi_memory_island_wrap.sv
@@ -43,7 +43,7 @@ module axi_memory_island_wrap #(
   parameter int unsigned SpillRspBank         = 0,
 
   /// Relinquish narrow priority after x cycles, 0 for never. Requires SpillNarrowReqRouted==0.
-  parameter int unsigned WidePriorityWait     = 0,
+  parameter int unsigned WidePriorityWait     = 1,
 
   /// Banking Factor for the Wide Ports (power of 2)
   parameter int unsigned NumWideBanks         = (1<<$clog2(NumWideReq))*2*2,
diff --git a/test/synth/axi_memory_island_synth.sv b/test/synth/axi_memory_island_synth.sv
index d11ab2f..612e7cd 100644
--- a/test/synth/axi_memory_island_synth.sv
+++ b/test/synth/axi_memory_island_synth.sv
@@ -137,7 +137,7 @@ module axi_memory_island_synth #(
   axi_wide_req_t    [NumWideReq  -1:0] wide_cut_req;
   axi_wide_resp_t   [NumWideReq  -1:0] wide_cut_rsp;
 
-  for (genvar i = 0; i < NumNarrowReq; i++) begin
+  for (genvar i = 0; i < NumNarrowReq; i++) begin : gen_narrow_assign
     assign narrow_req[i].aw_valid  = s_axi_narrow_awvalid [i];
     assign narrow_req[i].aw.id     = s_axi_narrow_awid    [i];
     assign narrow_req[i].aw.addr   = s_axi_narrow_awaddr  [i];
@@ -202,7 +202,7 @@ module axi_memory_island_synth #(
     );
   end
 
-  for (genvar i = 0; i < NumWideReq; i++) begin
+  for (genvar i = 0; i < NumWideReq; i++) begin : gen_wide_assign
     assign wide_req[i].aw_valid  = s_axi_wide_awvalid [i];
     assign wide_req[i].aw.id     = s_axi_wide_awid    [i];
     assign wide_req[i].aw.addr   = s_axi_wide_awaddr  [i];
@@ -279,7 +279,20 @@ module axi_memory_island_synth #(
     .axi_wide_rsp_t       ( axi_wide_resp_t   ),
     .NumNarrowReq         ( NumNarrowReq      ),
     .NumWideReq           ( NumWideReq        ),
-    .WordsPerBank         ( WordsPerBank      )
+    .WordsPerBank         ( WordsPerBank      ),
+    .SpillNarrowReqEntry (0),
+    .SpillNarrowRspEntry (0),
+    .SpillNarrowReqRouted(0),
+    .SpillNarrowRspRouted(0),
+    .SpillWideReqEntry   (0),
+    .SpillWideRspEntry   (0),
+    .SpillWideReqRouted  (0),
+    .SpillWideRspRouted  (0),
+    .SpillWideReqSplit   (0),
+    .SpillWideRspSplit   (0),
+    .SpillReqBank        (0),
+    .SpillRspBank        (1),
+    .WidePriorityWait    (2)
   ) i_mem_island (
     .clk_i,
     .rst_ni,