From 77e2e357a7b2f826c6485685bf7c48fe8fcff640 Mon Sep 17 00:00:00 2001 From: bbracker Date: Fri, 5 Mar 2021 14:36:07 -0500 Subject: [PATCH] more merging fixes --- wally-pipelined/src/uncore/uncore.sv | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wally-pipelined/src/uncore/uncore.sv b/wally-pipelined/src/uncore/uncore.sv index ff0111cf..ae6899c4 100644 --- a/wally-pipelined/src/uncore/uncore.sv +++ b/wally-pipelined/src/uncore/uncore.sv @@ -90,8 +90,7 @@ module uncore ( // tightly integrated memory dtim #(.BASE(`TIMBASE), .RANGE(`TIMRANGE)) dtim (.*); `ifdef BOOTTIMBASE - dtim #(.BASE(`BOOTTIMBASE), .RANGE(`BOOTTIMRANGE)) bootdtim (.MemRWtim(MemRWboottim), - .HSELTim(HSELBootTim), .HREADTim(HREADBootTim), .HRESPTim(HRESPBootTim), .HREADYTim(HREADYBootTim), .*); + dtim #(.BASE(`BOOTTIMBASE), .RANGE(`BOOTTIMRANGE)) bootdtim(.HSELTim(HSELBootTim), .HREADTim(HREADBootTim), .HRESPTim(HRESPBootTim), .HREADYTim(HREADYBootTim), .*); `endif // memory-mapped I/O peripherals