From 0cd8cec8b97557475dcff2cd09977e71d21ef5fe Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Fri, 5 Aug 2022 13:19:27 +0200 Subject: [PATCH] docs/getting: use tabs to export F4PGA_PACKAGES Signed-off-by: Unai Martinez-Corral --- .github/latest.patch | 7 ++++--- .github/scripts/install-toolchain.sh | 2 +- docs/getting.rst | 29 +++++++++++++++++++--------- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/latest.patch b/.github/latest.patch index 1956113..ae18c11 100644 --- a/.github/latest.patch +++ b/.github/latest.patch @@ -1,11 +1,12 @@ --- a/docs/getting.rst +++ b/docs/getting.rst -@@ -135,7 +135,7 @@ Next, setup Conda and your system's environment, and download architecture defin - esac +@@ -146,7 +146,7 @@ Next, setup Conda and your system's environment, and download architecture defin + F4PGA_HASH='df6d9e5' for PKG in $F4PGA_PACKAGES; do - wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/${F4PGA_TIMESTAMP}/symbiflow-arch-defs-${PKG}-${F4PGA_HASH}.tar.xz | tar -xJC $F4PGA_INSTALL_DIR/${FPGA_FAM} -+ wget -qO- $(wget -qO- https://github.com/SymbiFlow/f4pga-arch-defs/releases/download/latest/symbiflow-${PKG}-latest) | tar -xJC $F4PGA_INSTALL_DIR/${FPGA_FAM} ++ wget -qO- $(wget -qO- https://github.com/SymbiFlow/f4pga-arch-defs/releases/download/latest/symbiflow-${PKG}-latest) | tar -xJC $F4PGA_INSTALL_DIR/${FPGA_FAM} done If the above commands exited without errors, you have successfully installed and configured your working environment. +-- diff --git a/.github/scripts/install-toolchain.sh b/.github/scripts/install-toolchain.sh index 356fc79..70d6d7e 100755 --- a/.github/scripts/install-toolchain.sh +++ b/.github/scripts/install-toolchain.sh @@ -45,4 +45,4 @@ fi fpga_family=$1 os=$2 -tuttest_exec docs/getting.rst:install-reqs-$os,wget-conda,conda-install-dir,fpga-fam-$fpga_family,env-setup +tuttest_exec docs/getting.rst:install-reqs-$os,wget-conda,conda-install-dir,fpga-fam-$fpga_family,env-setup,packages-$fpga_family,get-packages diff --git a/docs/getting.rst b/docs/getting.rst index 43ab7df..87b984a 100644 --- a/docs/getting.rst +++ b/docs/getting.rst @@ -120,20 +120,31 @@ Next, setup Conda and your system's environment, and download architecture defin bash conda_installer.sh -u -b -p $F4PGA_INSTALL_DIR/$FPGA_FAM/conda; source "$F4PGA_INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh"; conda env create -f $FPGA_FAM/environment.yml + +.. tabs:: + + .. group-tab:: Artix-7 + + .. code-block:: bash + :name: packages-xc7 + + export F4PGA_PACKAGES='install-xc7 xc7a50t_test xc7a100t_test xc7a200t_test xc7z010_test' + + .. group-tab:: EOS S3 + + .. code-block:: bash + :name: packages-eos-s3 + + export F4PGA_PACKAGES='install-ql ql-eos-s3_wlcsp' + +.. code-block:: bash + :name: get-packages + mkdir -p $F4PGA_INSTALL_DIR/$FPGA_FAM F4PGA_TIMESTAMP='20220803-160711' F4PGA_HASH='df6d9e5' - case $FPGA_FAM in - xc7) - F4PGA_PACKAGES='install-xc7 xc7a50t_test xc7a100t_test xc7a200t_test xc7z010_test' - ;; - eos-s3) - F4PGA_PACKAGES='install-ql ql-eos-s3_wlcsp' - ;; - esac - for PKG in $F4PGA_PACKAGES; do wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/${F4PGA_TIMESTAMP}/symbiflow-arch-defs-${PKG}-${F4PGA_HASH}.tar.xz | tar -xJC $F4PGA_INSTALL_DIR/${FPGA_FAM} done