cores
/
microwatt
mirror of https://github.com/antonblanchard/microwatt
3
1
Fork 1
Code Issues Projects Releases Wiki Activity

Merge pull request #403 from mikey/litedram-warnings

Browse Source 
Fix litedram wrapper build warnings and metavalues
pull/406/head
Anton Blanchard 2 years ago committed by GitHub
parent 047f739b58 24d04ed8f9
commit d3fb2639dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File

14
litedram/extras/litedram-wrapper-l2.vhdl
Unescape Escape View File

@ -549,8 +549,8 @@ begin
-- Mask write selects with do_write since BRAM doesn't always -- Mask write selects with do_write since BRAM doesn't always
-- have a global write-enable (Vivado generates TDP instead -- have a global write-enable (Vivado generates TDP instead
-- of SDP when using one, thus doubling cache BRAM usage). -- of SDP when using one, thus doubling cache BRAM usage).
for i in 0 to ROW_SIZE-1 loop for j in 0 to ROW_SIZE-1 loop
wr_sel_m(i) <= wr_sel(i) and do_write; wr_sel_m(j) <= wr_sel(j) and do_write;
end loop; end loop;


if TRACE and rising_edge(system_clk) then if TRACE and rising_edge(system_clk) then
@ -796,7 +796,9 @@ begin
-- Store signals (hard wired for 64-bit wishbone at the moment) -- Store signals (hard wired for 64-bit wishbone at the moment)
req_wsl <= wb_req.adr(WB_WSEL_BITS-1 downto 0); req_wsl <= wb_req.adr(WB_WSEL_BITS-1 downto 0);
for i in 0 to WB_WORD_COUNT-1 loop for i in 0 to WB_WORD_COUNT-1 loop
if to_integer(unsigned(req_wsl)) = i then if is_X(req_wsl) then
req_we(WBSL*(i+1)-1 downto WBSL*i) <= x"XX";
elsif to_integer(unsigned(req_wsl)) = i then
req_we(WBSL*(i+1)-1 downto WBSL*i) <= wb_req.sel; req_we(WBSL*(i+1)-1 downto WBSL*i) <= wb_req.sel;
else else
req_we(WBSL*(i+1)-1 downto WBSL*i) <= x"00"; req_we(WBSL*(i+1)-1 downto WBSL*i) <= x"00";
@ -916,7 +918,9 @@ begin
stq_sel := storeq_rd_data(WBSL+WB_WSEL_BITS-1 downto WB_WSEL_BITS); stq_sel := storeq_rd_data(WBSL+WB_WSEL_BITS-1 downto WB_WSEL_BITS);
stq_wsl := storeq_rd_data(WB_WSEL_BITS-1 downto 0); stq_wsl := storeq_rd_data(WB_WSEL_BITS-1 downto 0);
for i in 0 to WB_WORD_COUNT-1 loop for i in 0 to WB_WORD_COUNT-1 loop
if to_integer(unsigned(stq_wsl)) = i then if is_X(stq_wsl) then
user_port0_wdata_we(WBSL*(i+1)-1 downto WBSL*i) <= x"XX";
elsif to_integer(unsigned(stq_wsl)) = i then
user_port0_wdata_we(WBSL*(i+1)-1 downto WBSL*i) <= stq_sel; user_port0_wdata_we(WBSL*(i+1)-1 downto WBSL*i) <= stq_sel;
else else
user_port0_wdata_we(WBSL*(i+1)-1 downto WBSL*i) <= x"00"; user_port0_wdata_we(WBSL*(i+1)-1 downto WBSL*i) <= x"00";
@ -1122,7 +1126,7 @@ begin
component litedram_trace_stub component litedram_trace_stub
end component; end component;
begin begin
litedram_trace: litedram_trace_stub; litedram_trace_s: litedram_trace_stub;
end generate; end generate;
litedram: litedram_core litedram: litedram_core

Write Preview
Loading…
Cancel
Save