From 6d0a4c788e445cca02ded868849b79298317451a Mon Sep 17 00:00:00 2001 From: Adam Zeloof Date: Sat, 10 Sep 2022 17:45:57 +0100 Subject: [PATCH 1/4] Added DFU support to Butterstick --- litex_boards/platforms/gsd_butterstick.py | 12 +++++++++--- litex_boards/targets/gsd_butterstick.py | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/litex_boards/platforms/gsd_butterstick.py b/litex_boards/platforms/gsd_butterstick.py index 05e270ec..e1593824 100644 --- a/litex_boards/platforms/gsd_butterstick.py +++ b/litex_boards/platforms/gsd_butterstick.py @@ -4,10 +4,11 @@ # Copyright (c) 2021 Greg Davill # Copyright (c) 2021 Florent Kermarrec # SPDX-License-Identifier: BSD-2-Clause - + from litex.build.generic_platform import * from litex.build.lattice import LatticePlatform from litex.build.lattice.programmer import OpenOCDJTAGProgrammer +from litex.build.dfu import DFUProg # IOs ---------------------------------------------------------------------------------------------- @@ -194,8 +195,13 @@ class Platform(LatticePlatform): connectors = {"1.0": _connectors_r1_0}[revision] LatticePlatform.__init__(self, f"LFE5UM5G-{device}-8BG381C", io, connectors, toolchain=toolchain, **kwargs) - def create_programmer(self): - return OpenOCDJTAGProgrammer("openocd_butterstick.cfg") + def create_programmer(self, load): + if load == "jtag": + return OpenOCDJTAGProgrammer("openocd_butterstick.cfg") + elif load == "dfu": + return DFUProg(vid="1209", pid="5af1", alt=0) + else: + print("Could not program board. "+load+" is not a valid argument. Please use 'jtag' or 'dfu'.") def do_finalize(self, fragment): LatticePlatform.do_finalize(self, fragment) diff --git a/litex_boards/targets/gsd_butterstick.py b/litex_boards/targets/gsd_butterstick.py index 2e382824..d44fcad0 100755 --- a/litex_boards/targets/gsd_butterstick.py +++ b/litex_boards/targets/gsd_butterstick.py @@ -155,7 +155,7 @@ def main(): parser = LiteXSoCArgumentParser(description="LiteX SoC on ButterStick") target_group = parser.add_argument_group(title="Target options") target_group.add_argument("--build", action="store_true", help="Build design.") - target_group.add_argument("--load", action="store_true", help="Load bitstream.") + target_group.add_argument("--load", default="jtag", help="Load bitstream (jtag or dfu).") target_group.add_argument("--toolchain", default="trellis", help="FPGA toolchain (trellis or diamond).") target_group.add_argument("--sys-clk-freq", default=75e6, help="System clock frequency.") target_group.add_argument("--revision", default="1.0", help="Board Revision (1.0).") @@ -201,7 +201,7 @@ def main(): builder.build(**builder_kargs) if args.load: - prog = soc.platform.create_programmer() + prog = soc.platform.create_programmer(args.load) prog.load_bitstream(builder.get_bitstream_filename(mode="sram")) if __name__ == "__main__": From e8504191e3758bac6dcea14b12328233b959d11a Mon Sep 17 00:00:00 2001 From: Adam Zeloof Date: Sat, 10 Sep 2022 17:54:43 +0100 Subject: [PATCH 2/4] cleanup --- litex_boards/platforms/gsd_butterstick.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litex_boards/platforms/gsd_butterstick.py b/litex_boards/platforms/gsd_butterstick.py index e1593824..a0334c49 100644 --- a/litex_boards/platforms/gsd_butterstick.py +++ b/litex_boards/platforms/gsd_butterstick.py @@ -201,7 +201,7 @@ class Platform(LatticePlatform): elif load == "dfu": return DFUProg(vid="1209", pid="5af1", alt=0) else: - print("Could not program board. "+load+" is not a valid argument. Please use 'jtag' or 'dfu'.") + print("Could not program board. " + load + " is not a valid argument. Please use 'jtag' or 'dfu'.") def do_finalize(self, fragment): LatticePlatform.do_finalize(self, fragment) From 6768be7f6609988e15afc219bfb380c259d05532 Mon Sep 17 00:00:00 2001 From: Adam Zeloof Date: Sat, 10 Sep 2022 17:56:02 +0100 Subject: [PATCH 3/4] changed use example comment --- litex_boards/targets/gsd_butterstick.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litex_boards/targets/gsd_butterstick.py b/litex_boards/targets/gsd_butterstick.py index d44fcad0..c0ca17fd 100755 --- a/litex_boards/targets/gsd_butterstick.py +++ b/litex_boards/targets/gsd_butterstick.py @@ -8,7 +8,7 @@ # SPDX-License-Identifier: BSD-2-Clause # Build/Use: -# ./gsd_butterstick.py --uart-name=crossover --with-etherbone --csr-csv=csr.csv --build --load +# ./gsd_butterstick.py --uart-name=crossover --with-etherbone --csr-csv=csr.csv --build --load (jtag / dfu) # litex_server --udp # litex_term crossover From 25c28d2c03f5034db7c3a09d2ef0e06083bf8a6c Mon Sep 17 00:00:00 2001 From: Adam Zeloof Date: Sat, 10 Sep 2022 18:16:04 +0100 Subject: [PATCH 4/4] fixed issue with default programmer option --- litex_boards/platforms/gsd_butterstick.py | 8 ++++---- litex_boards/targets/gsd_butterstick.py | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/litex_boards/platforms/gsd_butterstick.py b/litex_boards/platforms/gsd_butterstick.py index a0334c49..e39da29f 100644 --- a/litex_boards/platforms/gsd_butterstick.py +++ b/litex_boards/platforms/gsd_butterstick.py @@ -195,13 +195,13 @@ class Platform(LatticePlatform): connectors = {"1.0": _connectors_r1_0}[revision] LatticePlatform.__init__(self, f"LFE5UM5G-{device}-8BG381C", io, connectors, toolchain=toolchain, **kwargs) - def create_programmer(self, load): - if load == "jtag": + def create_programmer(self, programmer): + if programmer == "jtag": return OpenOCDJTAGProgrammer("openocd_butterstick.cfg") - elif load == "dfu": + elif programmer == "dfu": return DFUProg(vid="1209", pid="5af1", alt=0) else: - print("Could not program board. " + load + " is not a valid argument. Please use 'jtag' or 'dfu'.") + print("Could not program board. " + programmer + " is not a valid argument. Please use 'jtag' or 'dfu'.") def do_finalize(self, fragment): LatticePlatform.do_finalize(self, fragment) diff --git a/litex_boards/targets/gsd_butterstick.py b/litex_boards/targets/gsd_butterstick.py index c0ca17fd..1408d860 100755 --- a/litex_boards/targets/gsd_butterstick.py +++ b/litex_boards/targets/gsd_butterstick.py @@ -8,7 +8,7 @@ # SPDX-License-Identifier: BSD-2-Clause # Build/Use: -# ./gsd_butterstick.py --uart-name=crossover --with-etherbone --csr-csv=csr.csv --build --load (jtag / dfu) +# ./gsd_butterstick.py --uart-name=crossover --with-etherbone --csr-csv=csr.csv --build --load --programmer (jtag / dfu) # litex_server --udp # litex_term crossover @@ -155,7 +155,8 @@ def main(): parser = LiteXSoCArgumentParser(description="LiteX SoC on ButterStick") target_group = parser.add_argument_group(title="Target options") target_group.add_argument("--build", action="store_true", help="Build design.") - target_group.add_argument("--load", default="jtag", help="Load bitstream (jtag or dfu).") + target_group.add_argument("--load", action="store_true", help="Load bitstream.") + target_group.add_argument("--programmer", default="jtag", help="Programming interface (jtag or dfu).") target_group.add_argument("--toolchain", default="trellis", help="FPGA toolchain (trellis or diamond).") target_group.add_argument("--sys-clk-freq", default=75e6, help="System clock frequency.") target_group.add_argument("--revision", default="1.0", help="Board Revision (1.0).") @@ -201,7 +202,7 @@ def main(): builder.build(**builder_kargs) if args.load: - prog = soc.platform.create_programmer(args.load) + prog = soc.platform.create_programmer(args.programmer) prog.load_bitstream(builder.get_bitstream_filename(mode="sram")) if __name__ == "__main__":