Merge pull request #159 from antmicro/update-eos-s3

eos-s3: update environment, requirements and toolchain

.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

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/install/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:
 

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.
 

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

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