Skip to content

Commit 06e32c9

Browse files
author
Oron Port
committed
set consistent flash size limit to be Megabits
update platforms
1 parent 32ce4a3 commit 06e32c9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

compiler/ir/src/main/scala/dfhdl/compiler/ir/annotation.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ object constraints:
110110
final case class DeviceConfig(
111111
flashPartName: String,
112112
interface: DeviceConfig.Interface,
113-
sizeLimitMB: Int,
113+
sizeLimitMb: Int,
114114
masterRate: ConfigN[RateNumber]
115115
) extends GlobalConstraint derives ReadWriter:
116116
protected def `prot_=~`(that: HWAnnotation)(using MemberGetSet): Boolean = this == that
@@ -120,7 +120,7 @@ object constraints:
120120
val params = List(
121121
csParam("flashPartName", flashPartName),
122122
csParam("interface", interface),
123-
csParam("sizeLimitMB", sizeLimitMB),
123+
csParam("sizeLimitMb", sizeLimitMb),
124124
csParam("masterRate", masterRate)
125125
).filter(_.nonEmpty).mkString(", ")
126126
s"""@deviceConfig($params)"""

core/src/main/scala/dfhdl/hw/annotation.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ object constraints:
8585
final case class deviceConfig(
8686
flashPartName: String,
8787
interface: deviceConfig.Interface,
88-
sizeLimitMB: Int,
88+
sizeLimitMb: Int,
8989
masterRate: ir.ConfigN[ir.RateNumber] = None
9090
) extends GlobalConstraint:
9191
val asIR: ir.constraints.DeviceConfig =
92-
ir.constraints.DeviceConfig(flashPartName, interface, sizeLimitMB, masterRate)
92+
ir.constraints.DeviceConfig(flashPartName, interface, sizeLimitMb, masterRate)
9393
object deviceConfig:
9494
export ir.constraints.DeviceConfig.Interface
9595

lib/src/main/scala/dfhdl/tools/toolsCore/Vivado.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class VivadoProjectTclConfigPrinter(using
113113
case configConstraint: constraints.DeviceConfig => configConstraint
114114
}.getOrElse(throw new IllegalArgumentException("No `@deviceConfig` constraint found"))
115115
if (bo.flash)
116-
s"""\nwrite_cfgmem -format mcs -interface ${config.interface} -size ${config.sizeLimitMB} -loadbit "up 0x0 ./${topName}.bit" -file ./${topName}.mcs"""
116+
s"""\nwrite_cfgmem -format mcs -interface ${config.interface} -size ${config.sizeLimitMb / 8} -loadbit "up 0x0 ./${topName}.bit" -file ./${topName}.mcs"""
117117
else ""
118118
def configFileName: String = s"$topName.tcl"
119119
def contents: String =

0 commit comments

Comments
 (0)