From ffd312f6ea1c904a56ddffeb016c8c55fa2b2bae Mon Sep 17 00:00:00 2001 From: Anoop Date: Tue, 6 Apr 2021 10:10:39 +0530 Subject: [PATCH] conflict resolution --- generators/firechip/src/main/scala/TargetConfigs.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/firechip/src/main/scala/TargetConfigs.scala b/generators/firechip/src/main/scala/TargetConfigs.scala index dd2e2bcc..43fea874 100644 --- a/generators/firechip/src/main/scala/TargetConfigs.scala +++ b/generators/firechip/src/main/scala/TargetConfigs.scala @@ -77,7 +77,7 @@ class WithFireSimDesignTweaks extends Config( new freechips.rocketchip.subsystem.WithExtMemSize((1 << 30) * 16L) ++ // Optional: Removing this will require using an initramfs under linux new testchipip.WithBlockDevice ++ - // Optional: Set a UART baudrate (this selection matches FireSim's historical value) + // Required*: Scale default baud rate with periphery bus frequency new chipyard.config.WithUART(BigInt(3686400L)) ++ // Required: Do not support debug module w. JTAG until FIRRTL stops emitting @(posedge ~clock) new chipyard.config.WithNoDebug