X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=nmigen_boards%2Fice40_hx8k_b_evn.py;h=ffa00eea7ba71cafdfd8fd630e740c1a86ab3c1a;hb=cb0c2cd8595dab6dd3aa0c219a405e5f56880412;hp=4ff8d85ecf30378fe70efb716279a7eafa051395;hpb=bc2d42e451d7b866f0a28c1c3888a8b54ed219d2;p=nmigen-boards.git

diff --git a/nmigen_boards/ice40_hx8k_b_evn.py b/nmigen_boards/ice40_hx8k_b_evn.py
index 4ff8d85..ffa00ee 100644
--- a/nmigen_boards/ice40_hx8k_b_evn.py
+++ b/nmigen_boards/ice40_hx8k_b_evn.py
@@ -10,52 +10,53 @@ __all__ = ["ICE40HX8KBEVNPlatform"]
 
 
 class ICE40HX8KBEVNPlatform(LatticeICE40Platform):
-    device     = "iCE40HX8K"
-    package    = "CT256"
-    resources  = [
+    device      = "iCE40HX8K"
+    package     = "CT256"
+    default_clk = "clk12"
+    resources   = [
         Resource("clk12", 0, Pins("J3", dir="i"),
-                 Clock(12e6), Attrs(GLOBAL="1", IO_STANDARD="SB_LVCMOS33")),
+                 Clock(12e6), Attrs(GLOBAL=True, IO_STANDARD="SB_LVCMOS")),
 
-        Resource("user_led", 0, Pins("C3", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")), # D2
-        Resource("user_led", 1, Pins("B3", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")), # D3
-        Resource("user_led", 2, Pins("C4", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")), # D4
-        Resource("user_led", 3, Pins("C5", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")), # D5
-        Resource("user_led", 4, Pins("A1", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")), # D6
-        Resource("user_led", 5, Pins("A2", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")), # D7
-        Resource("user_led", 6, Pins("B4", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")), # D8
-        Resource("user_led", 7, Pins("B5", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS33")), # D9
+        Resource("user_led", 0, Pins("C3", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), # D2
+        Resource("user_led", 1, Pins("B3", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), # D3
+        Resource("user_led", 2, Pins("C4", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), # D4
+        Resource("user_led", 3, Pins("C5", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), # D5
+        Resource("user_led", 4, Pins("A1", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), # D6
+        Resource("user_led", 5, Pins("A2", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), # D7
+        Resource("user_led", 6, Pins("B4", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), # D8
+        Resource("user_led", 7, Pins("B5", dir="o"), Attrs(IO_STANDARD="SB_LVCMOS")), # D9
 
         UARTResource(0,
             rx="B10", tx="B12", rts="B13", cts="A15", dtr="A16", dsr="B14", dcd="B15",
-            attrs=Attrs(IO_STANDARD="SB_LVCMOS33", PULLUP="1")
+            attrs=Attrs(IO_STANDARD="SB_LVCMOS", PULLUP=1)
         ),
 
         *SPIFlashResources(0,
             cs="R12", clk="R11", mosi="P12", miso="P11",
-            attrs=Attrs(IO_STANDARD="SB_LVCMOS33")
+            attrs=Attrs(IO_STANDARD="SB_LVCMOS")
         ),
     ]
-    connectors = [
+    connectors  = [
         Connector("j", 1, # J1
-            "A16 -   A15 B15 B13 B14 -   -   B12 B11"
-            "A11 B10 A10 C9  -   -   A9  B9  B8  A7"
-            "B7  C7  -   -   A6  C6  B6  C5  A5  C4"
-            "-   -   B5  C3  B4  B3  A2  A1  -   -"),
+            "A16 -   A15 B15 B13 B14 -   -   B12 B11 "
+            "A11 B10 A10 C9  -   -   A9  B9  B8  A7  "
+            "B7  C7  -   -   A6  C6  B6  C5  A5  C4  "
+            "-   -   B5  C3  B4  B3  A2  A1  -   -   "),
         Connector("j", 2, # J2
-            "-   -   -   R15 P16 P15 -   -   N16 M15"
-            "M16 L16 K15 K16 -   -   K14 J14 G14 F14"
-            "J15 H14 -   -   H16 G15 G16 F15 F16 E14"
-            "-   -   E16 D15 D16 D14 C16 B16 -   -"),
+            "-   -   -   R15 P16 P15 -   -   N16 M15 "
+            "M16 L16 K15 K16 -   -   K14 J14 G14 F14 "
+            "J15 H14 -   -   H16 G15 G16 F15 F16 E14 "
+            "-   -   E16 D15 D16 D14 C16 B16 -   -   "),
         Connector("j", 3, # J3
-            "R16 -   T15 T16 T13 T14 -   -   N12 P13"
-            "N10 M11 T11 P10 -   -   T10 R10 P8  P9"
-            "T9  R9  -   -   T7  T8  T6  R6  T5  R5"
-            "-   -   R3  R4  R2  T3  T1  T2  -   -"),
+            "R16 -   T15 T16 T13 T14 -   -   N12 P13 "
+            "N10 M11 T11 P10 -   -   T10 R10 P8  P9  "
+            "T9  R9  -   -   T7  T8  T6  R6  T5  R5  "
+            "-   -   R3  R4  R2  T3  T1  T2  -   -   "),
         Connector("j", 4, # J4
-            "-   -   -   R1  P1  P2  -   -   N3  N2"
-            "M2  M1  L3  L1  -   -   K3  K1  J2  J1"
-            "H2  J3  -   -   G2  H1  F2  G1  E2  F1"
-            "-   -   D1  D2  C1  C2  B1  B2  -   -"),
+            "-   -   -   R1  P1  P2  -   -   N3  N2  "
+            "M2  M1  L3  L1  -   -   K3  K1  J2  J1  "
+            "H2  J3  -   -   G2  H1  F2  G1  E2  F1  "
+            "-   -   D1  D2  C1  C2  B1  B2  -   -   "),
     ]
 
     def toolchain_program(self, products, name):
@@ -66,5 +67,5 @@ class ICE40HX8KBEVNPlatform(LatticeICE40Platform):
 
 
 if __name__ == "__main__":
-    from ._blinky import build_and_program
-    build_and_program(ICE40HX8KBEVNPlatform, "clk12")
+    from ._blinky import Blinky
+    ICE40HX8KBEVNPlatform().build(Blinky(), do_program=True)