Merge branch 'xcelium-axi_lite_demux'

pulp-platform · Mar 23, 2020 · cebcb71 · cebcb71
2 parents f82f759 + 3d85546
commit cebcb71
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,8 +14,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `axi_lite_to_axi`: Add mandatory `AxiDataWidth` parameter to enable fix mentioned below.
 
 ### Fixed
-- `axi_lite_to_axi`: Improve compatibility with Xcelium by removing unsupported hierarchical
-  argument to `$bits()` function.
+- Improve compatibility with Xcelium:
+  - by removing unsupported hierarchical argument to `$bits()` function in `axi_lite_to_axi`;
+  - by removing unsupported `struct` assignment in `axi_lite_demux`.
 
 
 ## 0.16.3 - 2020-03-19

diff --git a/src/axi_lite_demux.sv b/src/axi_lite_demux.sv
@@ -121,10 +121,8 @@ module axi_lite_demux #(
     // AW Channel
     //--------------------------------------
     aw_chan_select_t slv_aw_inp;
-    assign slv_aw_inp = '{
-      aw:     slv_req_i.aw,
-      select: slv_aw_select_i
-    };
+    assign slv_aw_inp.aw     = slv_req_i.aw;
+    assign slv_aw_inp.select = slv_aw_select_i;
     spill_register #(
       .T      ( aw_chan_select_t ),
       .Bypass ( ~SpillAw         )
@@ -278,10 +276,8 @@ module axi_lite_demux #(
     // AR Channel
     //--------------------------------------
     ar_chan_select_t slv_ar_inp;
-    assign slv_ar_inp = '{
-      ar:     slv_req_i.ar,
-      select: slv_ar_select_i
-    };
+    assign slv_ar_inp.ar     = slv_req_i.ar;
+    assign slv_ar_inp.select = slv_ar_select_i;
     spill_register #(
       .T      ( ar_chan_select_t ),
       .Bypass ( ~SpillAr         )