From c870040a20c23423a5e65efb1913198bfc366fae Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Mon, 14 Dec 2020 16:54:07 +1100 Subject: [PATCH] Fix an issue in flash controller when BOOT_CLOCKS is false If BOOT_CLOCKS is false we currently get stuck in the flash state machine. This patch from Ben fixes it. Also fix an x state issue I see in icarus verilog where we need to reset auto_state. Signed-off-by: Anton Blanchard --- spi_flash_ctrl.vhdl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spi_flash_ctrl.vhdl b/spi_flash_ctrl.vhdl index d2b4992..e34a7c0 100644 --- a/spi_flash_ctrl.vhdl +++ b/spi_flash_ctrl.vhdl @@ -350,6 +350,7 @@ begin if rising_edge(clk) then if rst = '1' then auto_last_addr <= (others => '0'); + auto_state <= AUTO_BOOT; else auto_state <= auto_next; auto_cnt <= auto_cnt_next; @@ -429,6 +430,8 @@ begin if cmd_ready = '1' then auto_next <= AUTO_IDLE; end if; + else + auto_next <= AUTO_IDLE; end if; when AUTO_IDLE => -- Access to the memory map only when manual CS isn't set