From: Benjamin Herrenschmidt Date: Fri, 15 May 2020 03:11:58 +0000 (+1000) Subject: litedram: Forward system reset signal X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=30fd9aa298056def2eb08d6fb66702cb05f2f421;p=microwatt.git litedram: Forward system reset signal The wrapper wouldn't forward it. Make it do so Signed-off-by: Benjamin Herrenschmidt --- diff --git a/litedram/gen-src/wrapper-mw-init.vhdl b/litedram/gen-src/wrapper-mw-init.vhdl index f13edeb..c4d702e 100644 --- a/litedram/gen-src/wrapper-mw-init.vhdl +++ b/litedram/gen-src/wrapper-mw-init.vhdl @@ -119,8 +119,6 @@ architecture behaviour of litedram_wrapper is signal ad3 : std_ulogic; - signal dram_user_reset : std_ulogic; - signal wb_ctrl_adr : std_ulogic_vector(29 downto 0); signal wb_ctrl_dat_w : std_ulogic_vector(31 downto 0); signal wb_ctrl_dat_r : std_ulogic_vector(31 downto 0); @@ -234,7 +232,6 @@ begin -- Reset ignored, the reset controller use the pll lock signal, -- and alternate core reset address set when DRAM is not initialized. -- - system_reset <= '0'; core_alt_reset <= not init_done; -- State machine @@ -242,7 +239,7 @@ begin begin if rising_edge(system_clk) then - if dram_user_reset = '1' then + if system_reset = '1' then state <= CMD; else case state is @@ -286,7 +283,7 @@ begin init_done => init_done, init_error => init_error, user_clk => system_clk, - user_rst => dram_user_reset, + user_rst => system_reset, wb_ctrl_adr => wb_ctrl_adr, wb_ctrl_dat_w => wb_ctrl_dat_w, wb_ctrl_dat_r => wb_ctrl_dat_r,