riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

Correct Merge Conflitct -- clock, not clk (#327)

Browse Source 
I think there was a merge conflict somewhere. This should be 'clock', not 'clk'
This commit is contained in:
mwachs5
2016-09-21 20:02:01 -07:00
committed by Yunsup Lee
parent 1b1ef3be07
commit 9acb352cf6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vsrc/TestDriver.v
View File

@@ -9,7 +9,7 @@ module TestDriver;
reg clock = 1'b0; reg clock = 1'b0;
reg reset = 1'b1; reg reset = 1'b1;
always #(`CLOCK_PERIOD/2.0) clk = ~clk; always #(`CLOCK_PERIOD/2.0) clock = ~clock;
initial #(`RESET_DELAY) reset = 0; initial #(`RESET_DELAY) reset = 0;
// Read input arguments and initialize // Read input arguments and initialize