openframe better

Author: robtaylor

chipflow_lib/platforms/_openframe.py

@@ -1,6 +1,6 @@
-from typing import List, NamedTuple, Optional
+from typing import List, NamedTuple, Optional, Literal
 
-from .utils import Voltage, PowerPins, LinearAllocPackageDef
+from .utils import Voltage, PowerPins, LinearAllocPackageDef, BringupPins
 
 class OFPin(NamedTuple):
     pin: int
@@ -9,7 +9,7 @@ class OFPin(NamedTuple):
     voltage: Optional[Voltage] = None
     name: Optional[str] = None
 
-OF_GPIO_PINS = [
+OF_GPIO = [
     OFPin(31, "gpio", 0),  # gpio[31]
     OFPin(32, "gpio", 1),  # gpio[32]
     OFPin(33, "gpio", 2),  # gpio[33]
@@ -48,17 +48,24 @@ class OFPin(NamedTuple):
     OFPin(14, "gpio", 35),  # gpio[14]
     OFPin(15, "gpio", 36),  # gpio[15]
     OFPin(16, "gpio", 37),  # gpio[16]
-    OFPin(22, "gpio", 38),  # gpio[22]
-    OFPin(24, "gpio", 39),  # gpio[24]
+    # OFPin(22, "gpio", 38) is assigned as clock
+    # OFPin(24, "gpio", 39) is assigned as heartbeat
     OFPin(25, "gpio", 40),  # gpio[25]
     OFPin(26, "gpio", 41),  # gpio[26]
     OFPin(27, "gpio", 42),  # gpio[27]
     OFPin(28, "gpio", 43),  # gpio[28]
 ]
 
+OF_CLOCK_PIN = OFPin(22, "gpio", 38)
+OF_HEARTBEAT_PIN = OFPin(24, "gpio", 39)
 OF_RESET_PIN = OFPin(21, "resetbi")
 
-OF_POWER_PINS = [
+OF_CORE_POWER = [
+    (OFPin(18,"vcc", voltage=1.8, name="d"),     # Power, Digital power supply
+     OFPin(23,"vss", name="d")),                 # Digital power ground
+]
+
+OF_OTHER_POWER= [
     (OFPin(30,"vdd", voltage=3.3, name="a"),     # Power, Analog power supply
      OFPin(20,"vss", name="a")),                 # Analog power ground
 
@@ -71,9 +78,6 @@ class OFPin(NamedTuple):
     (OFPin(64,"vdd", voltage=3.3, name="io"),    # Power, ESD and padframe power supply
      OFPin(56,"vss", name="io")),                # ESD and padframe ground
 
-    (OFPin(18,"vcc", voltage=1.8, name="d"),     # Power, Digital power supply
-     OFPin(23,"vss", name="d")),                 # Digital power ground
-
     (OFPin(63,"vcc", voltage=1.8, name="d2"),    # Power, Digital power supply
      OFPin(10,"vss", name="d2")),                # Digital power ground
 
@@ -87,25 +91,35 @@ class OFPin(NamedTuple):
      OFPin(1,"vss", name="a2")),                 # Analog power ground
 ]
 
-OF_OTHER_PINS = [
+OF_OTHER = [
     OFPin(19, "NC")  # Not connected
 ]
 
 class OpenframePackageDef(LinearAllocPackageDef):
 
     name: str = "Openframe"
-
+    package_type: Literal["OpenframePackageDef"] = "OpenframePackageDef"
     def model_post_init(self, __context):
-        self._ordered_pins = OF_GPIO_PINS
+        self._ordered_pins = OF_GPIO
 
         super().model_post_init(__context)
 
 
     @property
-    def power(self) -> List[PowerPins]:
+    def core_power(self) -> List[PowerPins]:
         pps = []
-        for power, ground in OF_POWER_PINS:
+
+        for power, ground in OF_CORE_POWER:
             pp = PowerPins(power=power, ground=ground, voltage=power.voltage)
             pps.append(pp)
 
         return pps
+
+    @property
+    def bringup_pins(self) -> BringupPins:
+        return BringupPins(
+            core_power=self.core_power,
+            core_clock=OF_CLOCK_PIN,
+            core_reset=OF_RESET_PIN,
+            core_heartbeat=OF_HEARTBEAT_PIN,
+        )