mirror of
				https://github.com/openhwgroup/cvw
				synced 2025-02-11 06:05:49 +00:00 
			
		
		
		
	more merging fixes
This commit is contained in:
		
							parent
							
								
									2cd0f19129
								
							
						
					
					
						commit
						a1223ee13b
					
				@ -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
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user