Merge pull request #256 from antonblanchard/flash-reset

Fix a few reset issues in flash controller
pull/259/head
Michael Neuling 4 years ago committed by GitHub
commit d96ee21c39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -232,6 +232,10 @@ begin
if rst = '1' then if rst = '1' then
wb_out.ack <= '0'; wb_out.ack <= '0';
wb_out.stall <= '0'; wb_out.stall <= '0';
wb_stash.cyc <= '0';
wb_stash.stb <= '0';
wb_stash.sel <= (others => '0');
wb_stash.we <= '0';
else else
-- Latch wb responses as well for 1 cycle. Stall is updated -- Latch wb responses as well for 1 cycle. Stall is updated
-- below -- below
@ -344,6 +348,10 @@ begin
auto_sync: process(clk) auto_sync: process(clk)
begin begin
if rising_edge(clk) then if rising_edge(clk) then
if rst = '1' then
auto_last_addr <= (others => '0');
auto_state <= AUTO_BOOT;
else
auto_state <= auto_next; auto_state <= auto_next;
auto_cnt <= auto_cnt_next; auto_cnt <= auto_cnt_next;
auto_data <= auto_data_next; auto_data <= auto_data_next;
@ -351,6 +359,7 @@ begin
auto_last_addr <= auto_lad_next; auto_last_addr <= auto_lad_next;
end if; end if;
end if; end if;
end if;
end process; end process;


auto_comb: process(all) auto_comb: process(all)
@ -421,6 +430,8 @@ begin
if cmd_ready = '1' then if cmd_ready = '1' then
auto_next <= AUTO_IDLE; auto_next <= AUTO_IDLE;
end if; end if;
else
auto_next <= AUTO_IDLE;
end if; end if;
when AUTO_IDLE => when AUTO_IDLE =>
-- Access to the memory map only when manual CS isn't set -- Access to the memory map only when manual CS isn't set

Loading…
Cancel
Save