Skip to content
Snippets Groups Projects
Commit 92bd28c3 authored by David Lanzendörfer's avatar David Lanzendörfer
Browse files

Resolving yet another conflict

parent ab24cff2
No related branches found
No related tags found
No related merge requests found
...@@ -68,8 +68,6 @@ module AI_Accelerator_Top #( ...@@ -68,8 +68,6 @@ module AI_Accelerator_Top #(
mem_opdone <= 0; mem_opdone <= 0;
sram_we <= 4'b0000; sram_we <= 4'b0000;
sram_en <= 0; sram_en <= 0;
operation <= 0;
status <= 0;
mem_write_wait <= 0; mem_write_wait <= 0;
mem_read_wait <= 0; mem_read_wait <= 0;
sram_we <= 4'b0000; sram_we <= 4'b0000;
...@@ -286,6 +284,8 @@ module AI_Accelerator_Top #( ...@@ -286,6 +284,8 @@ module AI_Accelerator_Top #(
wbctrl_mem_data <= 32'b0; wbctrl_mem_data <= 32'b0;
wbctrl_addr_buf <= 32'b0; wbctrl_addr_buf <= 32'b0;
wbctrl_data_buf <= 32'b0; wbctrl_data_buf <= 32'b0;
status <= 0;
operation <= 0;
end end
else if (finished) begin else if (finished) begin
status <= 0; status <= 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment