wip

Author: robtaylor

chipflow_lib/__init__.py

@@ -85,8 +85,20 @@ def _ensure_chipflow_root():
                         "package": {
                             "enum": ["caravel", "cf20", "pga144"]
                         },
-                        "pads": {"$ref": "#/$defs/pin"},
-                        "power": {"$ref": "#/$defs/pin"},
+                        "power": {
+                            "type": "object",
+                            "patternProperties": {
+                                ".+": {
+                                    "type": "object",
+                                    "required": [
+                                        "name"
+                                    ],
+                                    "properties": {
+                                        "voltage":"string"
+                                    }
+                                }
+                            },
+                        },
                         "debug": {
                             "type": "object",
                             "properties": {
@@ -98,32 +110,6 @@ def _ensure_chipflow_root():
             },
         },
     },
-    "$defs": {
-        "pin": {
-            "type": "object",
-            "additionalProperties": False,
-            "minProperties": 1,
-            "patternProperties": {
-                ".+": {
-                    "type": "object",
-                    "required": [
-                        "type",
-                        "loc",
-                    ],
-                    "additionalProperties": False,
-                    "properties": {
-                        "type": {
-                            "enum": ["io", "i", "o", "oe", "clock", "reset", "power", "ground"]
-                        },
-                        "loc": {
-                            "type": "string",
-                            "pattern": "^[NSWE]?[0-9]+$"
-                        },
-                    }
-                }
-            }
-        }
-    }
 }
 
 

chipflow_lib/platforms/utils.py

@@ -125,11 +125,11 @@ def BidirPinSignature(width, **kwargs):
 PinList = List[Pin]
 Pins = Union[PinSet, PinList]
 
-class PowerPins(enum.Enum):
+class PowerType(enum.Enum):
     POWER = "power"
     GROUND = "ground"
 
-class JTAGPins(enum.Enum):
+class JTAGWireName(enum.Enum):
     TRST = "trst"
     TCK = "tck"
     TMS = "tms"
@@ -270,7 +270,7 @@ def clocks(self) -> Dict[int, Pin]:
 
     @property
     @abc.abstractmethod
-    def jtag(self) -> Dict[JTAGPin, Pin]:
+    def jtag(self) -> Dict[JTAGWireName, Pin]:
         """
         Map of JTAG pins for the package
         """