Merge branch 'fix-mpsoc-int-gen' into 'proposed_master'

mpsoc_int_gen: fix a dead-lock See merge request !49

Merge branch 'fix-mpsoc-int-gen' into 'proposed_master'
mpsoc_int_gen: fix a dead-lock See merge request !49
3f28d459 · Tristan Gingold · 116213af · ca0cd0fe · 3f28d459
Commit 3f28d459 authored Oct 10, 2023 by Tristan Gingold
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

mpsoc_int_gen.vhd modules/axi/mpsoc_int_gen/mpsoc_int_gen.vhd +4 -4

No files found.
--- a/modules/axi/mpsoc_int_gen/mpsoc_int_gen.vhd
+++ b/modules/axi/mpsoc_int_gen/mpsoc_int_gen.vhd
@@ -85,10 +85,10 @@ begin
  S_AXI_awsize <= "010";

  --  Normal Non-cacheable Non-bufferable
-  S_AXI_awcache <= "0010";
+  S_AXI_awcache <= "0000";

  --  Reuse the same id.
-  S_AXI_awid <= "000000";
+  S_AXI_awid <= b"00_0000";
  
  S_AXI_awlock <= '0';

@@ -108,12 +108,12 @@ begin
  S_AXI_wstrb(3 downto 0) <= "1111";
  S_AXI_wstrb(s_AXI_wstrb'left downto 4) <= (others => '0');

+  S_AXI_bready <= '1';
+
  process (clk_i)
  begin
    if rising_edge(clk_i) then

-      S_AXI_bready <= '1';
-
      if rst_n_i = '0' then
        S_AXI_awvalid <= '0';
        S_AXI_wvalid <= '0';