From 92bebabc52ba18853cf37d426c27c548b94c91fe Mon Sep 17 00:00:00 2001 From: Karol Gugala Date: Thu, 4 Mar 2021 13:05:44 +0100 Subject: [PATCH 1/2] QL: force tbb=2020.2 in conda env Signed-off-by: Karol Gugala --- eos-s3/environment.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eos-s3/environment.yml b/eos-s3/environment.yml index fc525dc..a912dc7 100644 --- a/eos-s3/environment.yml +++ b/eos-s3/environment.yml @@ -6,6 +6,8 @@ dependencies: - litex-hub::quicklogic-yosys=0.8.0_0021_g5eaf370c=20201120_145821 - litex-hub::quicklogic-yosys-plugins=1.2.0_0009_g9ab211c=20201120_145821 - litex-hub::quicklogic-vtr=v8.0.0.rc2_4003_g8980e4621=20200902_114536 + # FIXME: remove tbb pin once https://github.com/hdl/conda-eda/issues/84 is fixed + - tbb=2020.2 - make - lxml - simplejson From a9abd1f1765afb8e08af2628e98d60dccb0c8a60 Mon Sep 17 00:00:00 2001 From: Karol Gugala Date: Fri, 5 Mar 2021 11:55:28 +0100 Subject: [PATCH 2/2] QL: env: pin ql_fasm to exact commit Signed-off-by: Karol Gugala --- eos-s3/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos-s3/requirements.txt b/eos-s3/requirements.txt index 3042694..7e04682 100644 --- a/eos-s3/requirements.txt +++ b/eos-s3/requirements.txt @@ -1,2 +1,2 @@ python-constraint -git+https://github.com/QuickLogic-Corp/quicklogic-fasm +git+https://github.com/QuickLogic-Corp/quicklogic-fasm@2312ff03d5690449a597e565430764a162d452b7