From 4c743fd5828bfff6bb030a8c9f6f898fec2138dc Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sun, 11 Oct 2020 14:50:11 +0100
Subject: [PATCH] record commands for building ECP5

---
 src/soc/litex/florent/README.txt    | 7 +++++++
 src/soc/litex/florent/ls180soc.py   | 2 ++
 src/soc/litex/florent/versa_ecp5.py | 1 +
 3 files changed, 10 insertions(+)

diff --git a/src/soc/litex/florent/README.txt b/src/soc/litex/florent/README.txt
index 71d55183..2cab6638 100644
--- a/src/soc/litex/florent/README.txt
+++ b/src/soc/litex/florent/README.txt
@@ -1,4 +1,11 @@
+# sim openocd test
+
 create verilog file "python issuer_verilog libresoc.v"
 copy to libresoc/ directory
 terminal 1: ./sim.py
 terminal 2: openocd -f openocd.cfg -c init -c 'svf idcode_test2.svf'
+
+# ecp5 build
+
+./versa_ecp5.py --sys-clk-freq=55e6 --build
+./versa_ecp5.py --sys-clk-freq=55e6 --load
diff --git a/src/soc/litex/florent/ls180soc.py b/src/soc/litex/florent/ls180soc.py
index 9da9d180..4279effc 100755
--- a/src/soc/litex/florent/ls180soc.py
+++ b/src/soc/litex/florent/ls180soc.py
@@ -521,6 +521,8 @@ class LibreSoCSim(SoCCore):
         if not debug:
             return
 
+        jtag_en = ('jtag' in variant) or variant == 'ls180'
+
         # setup running of DMI FSM
         dmi_addr = Signal(4)
         dmi_din = Signal(64)
diff --git a/src/soc/litex/florent/versa_ecp5.py b/src/soc/litex/florent/versa_ecp5.py
index d2e157d7..55787f25 100755
--- a/src/soc/litex/florent/versa_ecp5.py
+++ b/src/soc/litex/florent/versa_ecp5.py
@@ -26,6 +26,7 @@ class TestSoC(BaseSoC):
         BaseSoC.__init__(self, sys_clk_freq,
             cpu_type = "external",
             cpu_cls  = LibreSoC,
+            cpu_variant = "standardjtag",
             #cpu_cls  = Microwatt,
             device        = "LFE5UM",
             **kwargs)
-- 
2.30.2