partner/platform/fomu: cleaup, make it similar to others platforms

litex_boards/partner/platforms/fomu_evt.py

@@ -2,23 +2,27 @@
 # This file is Copyright (c) 2019 Sean Cross <sean@xobs.io>
 # License: BSD
 
-# fomu evt board from from crowd funding
+# Fomu EVT board:
-# design files at https://github.com/im-tomu/fomu-hardware/tree/evt/hardware/pcb
+# - Crowd Supply campaign: https://www.crowdsupply.com/sutajio-kosagi/fomu
-#
+# - Design files: https://github.com/im-tomu/fomu-hardware/tree/evt/hardware/pcb
+
 from litex.build.generic_platform import *
 from litex.build.lattice import LatticePlatform
 from litex.build.lattice.programmer import IceStormProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
+    ("clk48", 0, Pins("44"), IOStandard("LVCMOS33")),
+
+    ("user_led_n", 0, Pins("41"), IOStandard("LVCMOS33")),
     ("rgb_led", 0,
         Subsignal("r", Pins("40")),
         Subsignal("g", Pins("39")),
         Subsignal("b", Pins("41")),
         IOStandard("LVCMOS33"),
     ),
-    # alias blue led
+
-    ("user_led_n",    0, Pins("41"), IOStandard("LVCMOS33")),
     ("user_btn_n", 0, Pins("42"), IOStandard("LVCMOS33")),
     ("user_btn_n", 1, Pins("38"), IOStandard("LVCMOS33")),
 
@@ -51,33 +55,24 @@ _io = [
         Subsignal("dq",   Pins("14 17 19 18"), IOStandard("LVCMOS33")),
     ),
 
-    ("clk48", 0, Pins("44"), IOStandard("LVCMOS33")),
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
+
 _connectors = [
     ("touch_pins", "48 47 46 45"),
     ("pmoda_n", "28 27 26 23"),
     ("pmodb_n", "48 47 46 45"),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
 
 class Platform(LatticePlatform):
     default_clk_name = "clk48"
     default_clk_period = 1e9/48e6
 
-    gateware_size = 0x20000
-
-    # FIXME: Create a "spi flash module" object in the same way we have SDRAM
-    spiflash_model = "n25q32"
-    spiflash_read_dummy_bits = 8
-    spiflash_clock_div = 2
-    spiflash_total_size = int((16/8)*1024*1024) # 16Mbit
-    spiflash_page_size = 256
-    spiflash_sector_size = 0x10000
-
     def __init__(self):
-        LatticePlatform.__init__(self, "ice40-up5k-sg48", _io, _connectors,
+        LatticePlatform.__init__(self, "ice40-up5k-sg48", _io, _connectors, toolchain="icestorm")
-                                 toolchain="icestorm")
 
     def create_programmer(self):
         return IceStormProgrammer()

litex_boards/partner/platforms/fomu_hacker.py

@@ -1,24 +1,25 @@
 # This file is Copyright (c) 2019 Tom Keddie <git@bronwenandtom.com>
 # License: BSD
 
-# fomu hacker board
+# Fomu Hacker board:
-# schematic at https://github.com/im-tomu/fomu-hardware/tree/master/hacker/releases/v0.0-19-g154fecc
+# - Design files: https://github.com/im-tomu/fomu-hardware/tree/master/hacker/releases/v0.0-19-g154fecc
-#
 
 from litex.build.generic_platform import *
 from litex.build.lattice import LatticePlatform
 from litex.build.lattice.programmer import IceStormProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
+    ("clk48", 0, Pins("F5"), IOStandard("LVCMOS33")),
+
+    ("user_led_n", 0, Pins("A5"), IOStandard("LVCMOS33")),
     ("rgb_led", 0,
         Subsignal("r", Pins("C5")),
         Subsignal("g", Pins("B5")),
         Subsignal("b", Pins("A5")),
         IOStandard("LVCMOS33")
     ),
-    # alias blue led
-    ("user_led_n",    0, Pins("A5"), IOStandard("LVCMOS33")),
 
     ("user_touch_n", 0, Pins("F4"), IOStandard("LVCMOS33")),
     ("user_touch_n", 1, Pins("E5"), IOStandard("LVCMOS33")),
@@ -32,12 +33,6 @@ _io = [
         IOStandard("LVCMOS33")
     ),
 
-    ("clk48", 0, Pins("F5"), IOStandard("LVCMOS33")),
-
-    # Adesto AT25SF161 - 16-Mbit - 2 megabyte
-    # Supports SPI Modes 0 and 3
-    # Supports Dual and Quad Output Read
-    #
     ("spiflash", 0,
         Subsignal("cs_n", Pins("C1"), IOStandard("LVCMOS33")),
         Subsignal("clk", Pins("D1"), IOStandard("LVCMOS33")),
@@ -46,32 +41,20 @@ _io = [
     ),
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
+
 _connectors = [
-    # Pins
-    # Pin 1 - F4 - Outside full square
-    # Pin 2 - E5
-    # Pin 3 - E4
-    # Pin 4 - F2 - Near notch on bottom
     ("touch_pins", "F4 E5 E4 F2"),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
+
 class Platform(LatticePlatform):
     default_clk_name = "clk48"
     default_clk_period = 1e9/48e6
 
-    gateware_size = 0x20000
-
-    # FIXME: Create a "spi flash module" object in the same way we have SDRAM
-    spiflash_model = "n25q32"
-    spiflash_read_dummy_bits = 8
-    spiflash_clock_div = 2
-    spiflash_total_size = int((16/8)*1024*1024) # 16Mbit, 1megabytes
-    spiflash_page_size = 256
-    spiflash_sector_size = 0x10000
-
     def __init__(self):
-        LatticePlatform.__init__(
+        LatticePlatform.__init__(self, "ice40-up5k-uwg30", _io, _connectors, toolchain="icestorm")
-            self, "ice40-up5k-uwg30", _io, _connectors, toolchain="icestorm")
 
     def create_programmer(self):
         return IceStormProgrammer()

litex_boards/partner/platforms/fomu_pvt.py

@@ -1,24 +1,31 @@
 # This file is Copyright (c) 2019 Tom Keddie <git@bronwenandtom.com>
 # License: BSD
 
-# fomu pvt board from crowd funding
+# Fomu PVT board:
-# design files at https://github.com/im-tomu/fomu-hardware/tree/pvt/hardware/pcb
+# - Crowd Supply campaign: https://www.crowdsupply.com/sutajio-kosagi/fomu
-#
+# - Design files: https://github.com/im-tomu/fomu-hardware/tree/pvt/hardware/pcb
 
 from litex.build.generic_platform import *
 from litex.build.lattice import LatticePlatform
 from litex.build.lattice.programmer import IceStormProgrammer
 
+# IOs ----------------------------------------------------------------------------------------------
 
 _io = [
+    ("clk48", 0, Pins("F4"), IOStandard("LVCMOS33")),
+
+    ("user_led_n", 0, Pins("A5"), IOStandard("LVCMOS33")),
     ("rgb_led", 0,
         Subsignal("r", Pins("C5")),
         Subsignal("g", Pins("B5")),
         Subsignal("b", Pins("A5")),
         IOStandard("LVCMOS33")
     ),
-    # alias blue led
+
-    ("user_led_n",    0, Pins("A5"), IOStandard("LVCMOS33")),
+    ("user_touch_n", 0, Pins("E4"), IOStandard("LVCMOS33")),
+    ("user_touch_n", 1, Pins("D5"), IOStandard("LVCMOS33")),
+    ("user_touch_n", 2, Pins("E5"), IOStandard("LVCMOS33")),
+    ("user_touch_n", 3, Pins("F5"), IOStandard("LVCMOS33")),
 
     ("usb", 0,
         Subsignal("d_p", Pins("A1")),
@@ -27,12 +34,6 @@ _io = [
         IOStandard("LVCMOS33")
     ),
 
-    ("clk48", 0, Pins("F4"), IOStandard("LVCMOS33")),
-
-    # Adesto AT25SF161 - 16-Mbit - 2 megabyte
-    # Supports SPI Modes 0 and 3
-    # Supports Dual and Quad Output Read
-    #
     ("spiflash", 0,
         Subsignal("cs_n", Pins("C1"), IOStandard("LVCMOS33")),
         Subsignal("clk", Pins("D1"), IOStandard("LVCMOS33")),
@@ -48,32 +49,20 @@ _io = [
     ),
 ]
 
+# Connectors ---------------------------------------------------------------------------------------
+
 _connectors = [
-    # Pins
-    # Pin 1
-    # Pin 2
-    # Pin 3
-    # Pin 4
     ("touch_pins", "E4 D5 E5 F5"),
 ]
 
+# Platform -----------------------------------------------------------------------------------------
+
 class Platform(LatticePlatform):
     default_clk_name = "clk48"
     default_clk_period = 1e9/48e6
 
-    gateware_size = 0x20000
-
-    # FIXME: Create a "spi flash module" object in the same way we have SDRAM
-    spiflash_model = "n25q32"
-    spiflash_read_dummy_bits = 8
-    spiflash_clock_div = 2
-    spiflash_total_size = int((16/8)*1024*1024) # 16Mbit, 1megabytes
-    spiflash_page_size = 256
-    spiflash_sector_size = 0x10000
-
     def __init__(self):
-        LatticePlatform.__init__(
+        LatticePlatform.__init__(self, "ice40-up5k-uwg30", _io, _connectors, toolchain="icestorm")
-            self, "ice40-up5k-uwg30", _io, _connectors, toolchain="icestorm")
 
     def create_programmer(self):
         return IceStormProgrammer()