From a5837bb0bab9f007159234c3d33e251f305d53bd Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 2 Jul 2021 12:45:40 +0200 Subject: [PATCH 1/2] eos-s3: update environment, requirements and toolchain Signed-off-by: Alessandro Comodi --- docs/building-examples.rst | 2 +- docs/getting-symbiflow.rst | 2 +- eos-s3/environment.yml | 10 +++------- eos-s3/requirements.txt | 3 ++- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/docs/building-examples.rst b/docs/building-examples.rst index 1b15f4e..11b499c 100644 --- a/docs/building-examples.rst +++ b/docs/building-examples.rst @@ -32,7 +32,7 @@ Next, prepare the environment: .. code-block:: bash :name: conda-prep-env - export PATH="$INSTALL_DIR/$FPGA_FAM/install/bin:$PATH"; + export PATH="$INSTALL_DIR/$FPGA_FAM/quicklogic-arch-defs/bin:$PATH"; source "$INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" Finally, enter your working Conda environment: diff --git a/docs/getting-symbiflow.rst b/docs/getting-symbiflow.rst index 6d759de..7118029 100644 --- a/docs/getting-symbiflow.rst +++ b/docs/getting-symbiflow.rst @@ -128,7 +128,7 @@ Download architecture definitions: .. code-block:: bash :name: download-arch-def-eos-s3 - wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/EWuqtXJmalROpI2L5XeewMIBRYVCY8H4yc10nlli-Xq79g?download=1 | tar -xJ -C $INSTALL_DIR/eos-s3/ + wget -qO- https://storage.googleapis.com/symbiflow-arch-defs-install/quicklogic-arch-defs-63c3d8f9.tar.gz | tar -xz -C $INSTALL_DIR/eos-s3/ If the above commands exited without errors, you have successfully installed and configured your working environment. diff --git a/eos-s3/environment.yml b/eos-s3/environment.yml index a912dc7..0b59244 100644 --- a/eos-s3/environment.yml +++ b/eos-s3/environment.yml @@ -3,19 +3,15 @@ channels: - conda-forge - litex-hub 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 + - litex-hub::quicklogic-yosys=0.8.0_105_gd282be04=20210625_074838 + - litex-hub::quicklogic-yosys-plugins=1.2.0_11_g21045a9=20210625_074838 + - litex-hub::vtr-optimized=8.0.0_4023_ge73e88940=20210625_074838 - make - lxml - simplejson - intervaltree - git - pip - - coreutils - - util-linux # Packages installed from PyPI - pip: - -r file:requirements.txt diff --git a/eos-s3/requirements.txt b/eos-s3/requirements.txt index 7e04682..b3b3f58 100644 --- a/eos-s3/requirements.txt +++ b/eos-s3/requirements.txt @@ -1,2 +1,3 @@ python-constraint -git+https://github.com/QuickLogic-Corp/quicklogic-fasm@2312ff03d5690449a597e565430764a162d452b7 +serial +git+https://github.com/QuickLogic-Corp/quicklogic-fasm From 2dbe7e8b5a2253f05babf67d04ee08215092fd51 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 2 Jul 2021 13:17:05 +0200 Subject: [PATCH 2/2] build-examples: fix conda-prep-env instructions Signed-off-by: Alessandro Comodi --- .github/scripts/build-examples.sh | 2 +- docs/building-examples.rst | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/scripts/build-examples.sh b/.github/scripts/build-examples.sh index 904d0c0..8896c23 100755 --- a/.github/scripts/build-examples.sh +++ b/.github/scripts/build-examples.sh @@ -54,7 +54,7 @@ fi # activate conda and enter example dir -snippets="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env,conda-act-env,enter-dir-$fpga_family" +snippets="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env-$fpga_family,conda-act-env,enter-dir-$fpga_family" # Xilinx 7-Series examples if [ "$fpga_family" = "xc7" ]; then diff --git a/docs/building-examples.rst b/docs/building-examples.rst index 11b499c..8e1317f 100644 --- a/docs/building-examples.rst +++ b/docs/building-examples.rst @@ -29,11 +29,23 @@ Select your FPGA family: Next, prepare the environment: -.. code-block:: bash - :name: conda-prep-env +.. tabs:: - export PATH="$INSTALL_DIR/$FPGA_FAM/quicklogic-arch-defs/bin:$PATH"; - source "$INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" + .. group-tab:: Artix-7 + + .. code-block:: bash + :name: conda-prep-env-xc7 + + export PATH="$INSTALL_DIR/$FPGA_FAM/install/bin:$PATH"; + source "$INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" + + .. group-tab:: EOS S3 + + .. code-block:: bash + :name: conda-prep-env-eos-s3 + + export PATH="$INSTALL_DIR/$FPGA_FAM/quicklogic-arch-defs/bin:$PATH"; + source "$INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh" Finally, enter your working Conda environment: