From 10fc74fc3e4fd8940fea8dec631e998a864277f1 Mon Sep 17 00:00:00 2001 From: Tom Keddie Date: Wed, 5 Jun 2019 09:45:38 -0700 Subject: [PATCH 1/3] Add fomu platform defs from mithro --- litex/boards/platforms/fomu_evt.py | 78 ++++++++++++++++++++++++++ litex/boards/platforms/fomu_hacker.py | 79 +++++++++++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 litex/boards/platforms/fomu_evt.py create mode 100644 litex/boards/platforms/fomu_hacker.py diff --git a/litex/boards/platforms/fomu_evt.py b/litex/boards/platforms/fomu_evt.py new file mode 100644 index 00000000..7b19ace1 --- /dev/null +++ b/litex/boards/platforms/fomu_evt.py @@ -0,0 +1,78 @@ +from litex.build.generic_platform import * +from litex.build.lattice import LatticePlatform +from litex.build.lattice.programmer import IceStormProgrammer + + +_io = [ + ("user_led_n", 0, Pins("41"), IOStandard("LVCMOS33")), + # Color-specific aliases + ("user_ledb_n", 0, Pins("41"), IOStandard("LVCMOS33")), + ("user_ledr_n", 0, Pins("40"), IOStandard("LVCMOS33")), + ("user_ledg_n", 0, Pins("39"), IOStandard("LVCMOS33")), + ("user_btn_n", 0, Pins("42"), IOStandard("LVCMOS33")), + ("user_btn_n", 1, Pins("38"), IOStandard("LVCMOS33")), + + ("user_pad_n", 0, Pins("48"), IOStandard("LVCMOS33")), + ("user_pad_n", 1, Pins("47"), IOStandard("LVCMOS33")), + ("user_pad_n", 2, Pins("46"), IOStandard("LVCMOS33")), + ("user_pad_n", 3, Pins("45"), IOStandard("LVCMOS33")), + + ("pmod_n", 0, Pins("25"), IOStandard("LVCMOS33")), + ("pmod_n", 1, Pins("26"), IOStandard("LVCMOS33")), + ("pmod_n", 2, Pins("27"), IOStandard("LVCMOS33")), # These two pins are + ("pmod_n", 3, Pins("28"), IOStandard("LVCMOS33")), # swapped somehow. + + ("serial", 0, + Subsignal("rx", Pins("21")), + Subsignal("tx", Pins("13"), Misc("PULLUP")), + IOStandard("LVCMOS33") + ), + + ("usb", 0, + Subsignal("d_p", Pins("34")), + Subsignal("d_n", Pins("37")), + Subsignal("pullup", Pins("35")), + IOStandard("LVCMOS33") + ), + + ("spiflash", 0, + Subsignal("cs_n", Pins("16"), IOStandard("LVCMOS33")), + Subsignal("clk", Pins("15"), IOStandard("LVCMOS33")), + Subsignal("miso", Pins("17"), IOStandard("LVCMOS33")), + Subsignal("mosi", Pins("14"), IOStandard("LVCMOS33")), + Subsignal("wp", Pins("18"), IOStandard("LVCMOS33")), + Subsignal("hold", Pins("19"), IOStandard("LVCMOS33")), + ), + + ("spiflash4x", 0, + Subsignal("cs_n", Pins("16"), IOStandard("LVCMOS33")), + Subsignal("clk", Pins("15"), IOStandard("LVCMOS33")), + Subsignal("dq", Pins("14 17 19 18"), IOStandard("LVCMOS33")), + ), + + ("clk48", 0, Pins("44"), IOStandard("LVCMOS33")) +] + +_connectors = [] + + +class Platform(LatticePlatform): + default_clk_name = "clk48" + default_clk_period = 20.833 + + 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, + toolchain="icestorm") + + def create_programmer(self): + return IceStormProgrammer() diff --git a/litex/boards/platforms/fomu_hacker.py b/litex/boards/platforms/fomu_hacker.py new file mode 100644 index 00000000..2e594788 --- /dev/null +++ b/litex/boards/platforms/fomu_hacker.py @@ -0,0 +1,79 @@ +from litex.build.generic_platform import * +from litex.build.lattice import LatticePlatform +from litex.build.lattice.programmer import IceStormProgrammer + + +_io = [ + ("rgb_led", 0, + Subsignal("r", Pins("C5")), + Subsignal("g", Pins("B5")), + Subsignal("b", Pins("A5")), + IOStandard("LVCMOS33") + ), + + + ("usb", 0, + Subsignal("d_p", Pins("A4")), + Subsignal("d_n", Pins("A2")), + Subsignal("pullup", Pins("D5")), + 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")), + Subsignal("mosi", Pins("F1"), IOStandard("LVCMOS33")), + Subsignal("miso", Pins("E1"), IOStandard("LVCMOS33")), + ), +] + +spiflash = [ +] + +_connectors = [ + # Pins + # Pin 1 - F4 - Outside full square + # Pin 2 - E5 + # Pin 3 - E4 + # Pin 4 - F2 - Near notch on bottom + ("pins", "F4 E5 E4 F2"), +] + +# The ICE40UP5K-B-EVN does not use the provided FT2232H chip to provide a +# UART port. One must use their own USB-to-serial cable instead to get a UART. +# Using the second 6-pin PMOD port. Follows Digilent PMOD Specification Type 4, +# so e.g. PMOD USBUART can be used. +pins_serial = [ + ("serial", 0, + Subsignal("rx", Pins("pins:1")), + Subsignal("tx", Pins("pins:2")), + IOStandard("LVCMOS33"), + ), +] + +class Platform(LatticePlatform): + default_clk_name = "clk48" + default_clk_period = 20.833 + + 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__( + self, "ice40-up5k-uwg30", _io, _connectors, toolchain="icestorm") + + def create_programmer(self): + return IceStormProgrammer() From d9cf64b8b5d1b3812d72d099338e5b0a902da3f8 Mon Sep 17 00:00:00 2001 From: Tom Keddie Date: Wed, 5 Jun 2019 11:14:32 -0700 Subject: [PATCH 2/3] Update @mithro fomu platform defs from @xobs foboot and try to make them all match the litex style a little more --- litex/boards/platforms/fomu_evt.py | 40 +++++++++++++-------------- litex/boards/platforms/fomu_hacker.py | 35 ++++++++++++----------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/litex/boards/platforms/fomu_evt.py b/litex/boards/platforms/fomu_evt.py index 7b19ace1..35a5cd56 100644 --- a/litex/boards/platforms/fomu_evt.py +++ b/litex/boards/platforms/fomu_evt.py @@ -4,24 +4,17 @@ from litex.build.lattice.programmer import IceStormProgrammer _io = [ + ("rgb_led_n", 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")), - # Color-specific aliases - ("user_ledb_n", 0, Pins("41"), IOStandard("LVCMOS33")), - ("user_ledr_n", 0, Pins("40"), IOStandard("LVCMOS33")), - ("user_ledg_n", 0, Pins("39"), IOStandard("LVCMOS33")), ("user_btn_n", 0, Pins("42"), IOStandard("LVCMOS33")), ("user_btn_n", 1, Pins("38"), IOStandard("LVCMOS33")), - ("user_pad_n", 0, Pins("48"), IOStandard("LVCMOS33")), - ("user_pad_n", 1, Pins("47"), IOStandard("LVCMOS33")), - ("user_pad_n", 2, Pins("46"), IOStandard("LVCMOS33")), - ("user_pad_n", 3, Pins("45"), IOStandard("LVCMOS33")), - - ("pmod_n", 0, Pins("25"), IOStandard("LVCMOS33")), - ("pmod_n", 1, Pins("26"), IOStandard("LVCMOS33")), - ("pmod_n", 2, Pins("27"), IOStandard("LVCMOS33")), # These two pins are - ("pmod_n", 3, Pins("28"), IOStandard("LVCMOS33")), # swapped somehow. - ("serial", 0, Subsignal("rx", Pins("21")), Subsignal("tx", Pins("13"), Misc("PULLUP")), @@ -32,15 +25,16 @@ _io = [ Subsignal("d_p", Pins("34")), Subsignal("d_n", Pins("37")), Subsignal("pullup", Pins("35")), + Subsignal("pulldown", Pins("36")), IOStandard("LVCMOS33") ), ("spiflash", 0, - Subsignal("cs_n", Pins("16"), IOStandard("LVCMOS33")), - Subsignal("clk", Pins("15"), IOStandard("LVCMOS33")), - Subsignal("miso", Pins("17"), IOStandard("LVCMOS33")), - Subsignal("mosi", Pins("14"), IOStandard("LVCMOS33")), - Subsignal("wp", Pins("18"), IOStandard("LVCMOS33")), + Subsignal("cs_n", Pins("16"), IOStandard("LVCMOS33")), + Subsignal("clk", Pins("15"), IOStandard("LVCMOS33")), + Subsignal("miso", Pins("17"), IOStandard("LVCMOS33")), + Subsignal("mosi", Pins("14"), IOStandard("LVCMOS33")), + Subsignal("wp", Pins("18"), IOStandard("LVCMOS33")), Subsignal("hold", Pins("19"), IOStandard("LVCMOS33")), ), @@ -50,10 +44,14 @@ _io = [ Subsignal("dq", Pins("14 17 19 18"), IOStandard("LVCMOS33")), ), - ("clk48", 0, Pins("44"), 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"), +] class Platform(LatticePlatform): diff --git a/litex/boards/platforms/fomu_hacker.py b/litex/boards/platforms/fomu_hacker.py index 2e594788..dff3e65c 100644 --- a/litex/boards/platforms/fomu_hacker.py +++ b/litex/boards/platforms/fomu_hacker.py @@ -4,13 +4,24 @@ from litex.build.lattice.programmer import IceStormProgrammer _io = [ + ("serial", 0, + Subsignal("rx", Pins("C3")), + Subsignal("tx", Pins("B3"), Misc("PULLUP")), + 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")), + ("user_touch_n", 2, Pins("E4"), IOStandard("LVCMOS33")), + ("user_touch_n", 3, Pins("F2"), IOStandard("LVCMOS33")), ("usb", 0, Subsignal("d_p", Pins("A4")), @@ -30,10 +41,14 @@ _io = [ Subsignal("clk", Pins("D1"), IOStandard("LVCMOS33")), Subsignal("mosi", Pins("F1"), IOStandard("LVCMOS33")), Subsignal("miso", Pins("E1"), IOStandard("LVCMOS33")), + Subsignal("wp", Pins("A1"), IOStandard("LVCMOS33")), + Subsignal("hold", Pins("B1"), IOStandard("LVCMOS33")), + ), + ("spiflash4x", 0, + Subsignal("cs_n", Pins("C1"), IOStandard("LVCMOS33")), + Subsignal("clk", Pins("D1"), IOStandard("LVCMOS33")), + Subsignal("dq", Pins("E1 F1 A1 B1"), IOStandard("LVCMOS33")), ), -] - -spiflash = [ ] _connectors = [ @@ -42,19 +57,7 @@ _connectors = [ # Pin 2 - E5 # Pin 3 - E4 # Pin 4 - F2 - Near notch on bottom - ("pins", "F4 E5 E4 F2"), -] - -# The ICE40UP5K-B-EVN does not use the provided FT2232H chip to provide a -# UART port. One must use their own USB-to-serial cable instead to get a UART. -# Using the second 6-pin PMOD port. Follows Digilent PMOD Specification Type 4, -# so e.g. PMOD USBUART can be used. -pins_serial = [ - ("serial", 0, - Subsignal("rx", Pins("pins:1")), - Subsignal("tx", Pins("pins:2")), - IOStandard("LVCMOS33"), - ), + ("touch_pins", "F4 E5 E4 F2"), ] class Platform(LatticePlatform): From c87412b09839f5ef49dfe8f9a9041ead3dfecd83 Mon Sep 17 00:00:00 2001 From: Tom Keddie Date: Fri, 7 Jun 2019 06:29:07 -0700 Subject: [PATCH 3/3] Review feedback - rename dvt to pvt - remove serial from both pvt and hacker - remove NC spi wp and hold pins from hacker - remove spiflash4x as pins are NC Added links to schematic/cad data --- litex/boards/platforms/fomu_evt.py | 3 ++ litex/boards/platforms/fomu_hacker.py | 16 ++---- litex/boards/platforms/fomu_pvt.py | 76 +++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 litex/boards/platforms/fomu_pvt.py diff --git a/litex/boards/platforms/fomu_evt.py b/litex/boards/platforms/fomu_evt.py index 35a5cd56..f05efd23 100644 --- a/litex/boards/platforms/fomu_evt.py +++ b/litex/boards/platforms/fomu_evt.py @@ -1,3 +1,6 @@ +# fomu evt board from from crowd funding +# design files at 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 diff --git a/litex/boards/platforms/fomu_hacker.py b/litex/boards/platforms/fomu_hacker.py index dff3e65c..2f64152c 100644 --- a/litex/boards/platforms/fomu_hacker.py +++ b/litex/boards/platforms/fomu_hacker.py @@ -1,14 +1,13 @@ +# fomu hacker board +# schematic at 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 _io = [ - ("serial", 0, - Subsignal("rx", Pins("C3")), - Subsignal("tx", Pins("B3"), Misc("PULLUP")), - IOStandard("LVCMOS33") - ), ("rgb_led", 0, Subsignal("r", Pins("C5")), Subsignal("g", Pins("B5")), @@ -41,13 +40,6 @@ _io = [ Subsignal("clk", Pins("D1"), IOStandard("LVCMOS33")), Subsignal("mosi", Pins("F1"), IOStandard("LVCMOS33")), Subsignal("miso", Pins("E1"), IOStandard("LVCMOS33")), - Subsignal("wp", Pins("A1"), IOStandard("LVCMOS33")), - Subsignal("hold", Pins("B1"), IOStandard("LVCMOS33")), - ), - ("spiflash4x", 0, - Subsignal("cs_n", Pins("C1"), IOStandard("LVCMOS33")), - Subsignal("clk", Pins("D1"), IOStandard("LVCMOS33")), - Subsignal("dq", Pins("E1 F1 A1 B1"), IOStandard("LVCMOS33")), ), ] diff --git a/litex/boards/platforms/fomu_pvt.py b/litex/boards/platforms/fomu_pvt.py new file mode 100644 index 00000000..4c6c2b55 --- /dev/null +++ b/litex/boards/platforms/fomu_pvt.py @@ -0,0 +1,76 @@ +# fomu pvt board from crowd funding +# design files at 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 + + +_io = [ + ("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")), + + ("usb", 0, + Subsignal("d_p", Pins("A1")), + Subsignal("d_n", Pins("A2")), + Subsignal("pullup", Pins("A4")), + 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")), + Subsignal("mosi", Pins("F1"), IOStandard("LVCMOS33")), + Subsignal("miso", Pins("E1"), IOStandard("LVCMOS33")), + Subsignal("wp", Pins("F2"), IOStandard("LVCMOS33")), + Subsignal("hold", Pins("B1"), IOStandard("LVCMOS33")), + ), + ("spiflash4x", 0, + Subsignal("cs_n", Pins("C1"), IOStandard("LVCMOS33")), + Subsignal("clk", Pins("D1"), IOStandard("LVCMOS33")), + Subsignal("dq", Pins("E1 F1 F2 B1"), IOStandard("LVCMOS33")), + ), +] + +_connectors = [ + # Pins + # Pin 1 + # Pin 2 + # Pin 3 + # Pin 4 + ("touch_pins", "E4 D5 E5 F5"), +] + +class Platform(LatticePlatform): + default_clk_name = "clk48" + default_clk_period = 20.833 + + 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__( + self, "ice40-up5k-uwg30", _io, _connectors, toolchain="icestorm") + + def create_programmer(self): + return IceStormProgrammer()