From fd2614e19367c45a3be25909aa73754d017b2cf6 Mon Sep 17 00:00:00 2001 From: Kamil Rakoczy Date: Thu, 17 Sep 2020 14:47:04 +0200 Subject: [PATCH] Update quicklogic toolchain to v1.2.0 Signed-off-by: Kamil Rakoczy --- .travis.yml | 6 ++++-- README.rst | 3 +-- eos-s3/README.rst | 3 +-- eos-s3/environment.yml | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc3d912..d61ca35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,9 @@ before_install: install: - if [ "$OS" = "ubuntu" ]; then export INSTALL_COMMAND="apt update && apt install -y"; fi - if [ "$OS" = "centos" ]; then export INSTALL_COMMAND="yum -y install"; fi - - if [ "$OS" = "ubuntu" ]; then export INSTALL_PACKAGES="git wget make"; fi - - if [ "$OS" = "centos" ]; then export INSTALL_PACKAGES="git wget make"; fi + - if [ "$OS" = "ubuntu" ]; then export INSTALL_PACKAGES="wget"; fi + - if [ "$OS" = "centos" ]; then export INSTALL_PACKAGES="wget"; fi + - if [ "$OS" = "centos" ] && [ "$OS_VERSION" = "6" ]; then export INSTALL_PACKAGES="$INSTALL_PACKAGES util-linux-ng"; fi # Install missing `getopt` binary in centos 6 - export DOCKER_NAME=test - export IN_DOCKER_EXEC="docker exec -t $DOCKER_NAME bash -c" - docker create @@ -50,6 +51,7 @@ install: $OS:$OS_VERSION - docker start $DOCKER_NAME - $IN_DOCKER_EXEC "$INSTALL_COMMAND $INSTALL_PACKAGES" + - if [ "$OS_VERSION" = "6" ] || [ "$OS_VERSION" = "trusty" ]; then $IN_DOCKER_EXEC "echo 'readlink -f \$@' | tee -a /usr/bin/realpath;chmod +x /usr/bin/realpath"; fi # Replace missing `realpath` binary with readlink -f - tuttest README.rst unnamed0 --prefix-lines-with "$IN_DOCKER_EXEC" | bash - - if [ "$TOOLCHAIN" = "xilinx-series-7" ]; then tuttest xc7/README.rst unnamed0 --prefix-lines-with "$IN_DOCKER_EXEC" | bash -; fi - if [ "$TOOLCHAIN" = "quicklogic" ]; then tuttest eos-s3/README.rst unnamed0 --prefix-lines-with "$IN_DOCKER_EXEC" | bash -; fi diff --git a/README.rst b/README.rst index e6cf601..6ebde32 100644 --- a/README.rst +++ b/README.rst @@ -84,8 +84,7 @@ and so you will need to add some ``sudo`` commands to the instructions below. source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh" conda env create -f eos-s3/environment.yml conda activate eos-s3 - wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/Eb7341Bq-XRAukVQ6oQ6PrgB-qdFbrsrPEON1yTa4krFSA?download=1 | tar -xJ -C $INSTALL_DIR/eos-s3 - cp -r $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/yosys/* $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/ + wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/EWuqtXJmalROpI2L5XeewMIBRYVCY8H4yc10nlli-Xq79g?download=1 | tar -xJ -C $INSTALL_DIR conda deactivate Build Example Designs diff --git a/eos-s3/README.rst b/eos-s3/README.rst index e379617..06416aa 100644 --- a/eos-s3/README.rst +++ b/eos-s3/README.rst @@ -33,8 +33,7 @@ Choose the installation directory (see the `README <../README.rst>`_ one level u source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh" conda env create -f eos-s3/environment.yml conda activate eos-s3 - wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/Eb7341Bq-XRAukVQ6oQ6PrgB-qdFbrsrPEON1yTa4krFSA?download=1 | tar -xJ -C $INSTALL_DIR/eos-s3 - cp -r $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/yosys/* $INSTALL_DIR/eos-s3/conda/envs/eos-s3/share/ + wget -qO- https://quicklogic-my.sharepoint.com/:u:/p/kkumar/EWuqtXJmalROpI2L5XeewMIBRYVCY8H4yc10nlli-Xq79g?download=1 | tar -xJ -C $INSTALL_DIR conda deactivate .. toolchain_include_end_label diff --git a/eos-s3/environment.yml b/eos-s3/environment.yml index f28ee91..2f4802a 100644 --- a/eos-s3/environment.yml +++ b/eos-s3/environment.yml @@ -1,11 +1,11 @@ name: eos-s3 channels: - conda-forge - - quicklogic-corp + - quicklogic-corp/label/ql dependencies: - - quicklogic-corp::yosys=0.6.0_0013_g2478b28 - - quicklogic-corp::yosys-plugins=0.1.0_0005_g6bbbc9b - - quicklogic-corp::vtr=v8.0.0_rc2_4006_g36a4d4b + - yosys=0.5_7972_g4045d484=20200817_053125 + - yosys-plugins=1.2.0_0009_g9ab211c=20200817_053125 + - vtr=v8.0.0_rc2_4003_g8980e4621=20200817_053125 - make - lxml - simplejson