fix esl-epfl#266 and esl-epfl#289

davideschiavone · May 26, 2023 · 9be20d1 · 9be20d1
1 parent 9100136
commit 9be20d1
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 819 deletions.
diff --git a/hw/core-v-mini-mcu/core_v_mini_mcu.sv b/hw/core-v-mini-mcu/core_v_mini_mcu.sv
@@ -271,8 +271,8 @@ module core_v_mini_mcu
     output reg_req_t pad_req_o,
     input  reg_rsp_t pad_resp_i,
 
-    input  obi_req_t  [EXT_DOMAINS_RND-1:0] ext_xbar_master_req_i,
-    output obi_resp_t [EXT_DOMAINS_RND-1:0] ext_xbar_master_resp_o,
+    input  obi_req_t  [EXT_XBAR_NMASTER_RND-1:0] ext_xbar_master_req_i,
+    output obi_resp_t [EXT_XBAR_NMASTER_RND-1:0] ext_xbar_master_resp_o,
 
     output obi_req_t  ext_xbar_slave_req_o,
     input  obi_resp_t ext_xbar_slave_resp_i,

diff --git a/hw/core-v-mini-mcu/core_v_mini_mcu.sv.tpl b/hw/core-v-mini-mcu/core_v_mini_mcu.sv.tpl
@@ -34,8 +34,8 @@ module core_v_mini_mcu
     output reg_req_t pad_req_o,
     input  reg_rsp_t pad_resp_i,
 
-    input  obi_req_t  [EXT_DOMAINS_RND-1:0] ext_xbar_master_req_i,
-    output obi_resp_t [EXT_DOMAINS_RND-1:0] ext_xbar_master_resp_o,
+    input  obi_req_t  [EXT_XBAR_NMASTER_RND-1:0] ext_xbar_master_req_i,
+    output obi_resp_t [EXT_XBAR_NMASTER_RND-1:0] ext_xbar_master_resp_o,
 
     output obi_req_t  ext_xbar_slave_req_o,
     input  obi_resp_t ext_xbar_slave_resp_i,

diff --git a/hw/ip_examples/memcopy_periph/data/memcopy_periph.hjson b/hw/ip_examples/memcopy_periph/data/memcopy_periph.hjson
diff --git a/hw/ip_examples/memcopy_periph/example_memcopy_periph.core b/hw/ip_examples/memcopy_periph/example_memcopy_periph.core
diff --git a/hw/ip_examples/memcopy_periph/memcopy_periph.vlt b/hw/ip_examples/memcopy_periph/memcopy_periph.vlt
diff --git a/hw/ip_examples/memcopy_periph/memcopy_periph_gen.sh b/hw/ip_examples/memcopy_periph/memcopy_periph_gen.sh
diff --git a/hw/ip_examples/memcopy_periph/memcopy_periph_regs.h b/hw/ip_examples/memcopy_periph/memcopy_periph_regs.h
diff --git a/hw/ip_examples/memcopy_periph/rtl/memcopy_periph.sv b/hw/ip_examples/memcopy_periph/rtl/memcopy_periph.sv