From 05a8036a0072136988a8cd3541bba7a33b794c69 Mon Sep 17 00:00:00 2001
From: Unai Martinez-Corral <umartinezcorral@antmicro.com>
Date: Thu, 4 Aug 2022 05:08:07 +0200
Subject: [PATCH 1/2] docs: do not use 'install' subdir; bump f4pga and
 arch-defs

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
---
 .github/latest.patch       | 4 ++--
 common/requirements.txt    | 2 +-
 docs/building-examples.rst | 1 -
 docs/getting.rst           | 8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/latest.patch b/.github/latest.patch
index 2922c7d..1956113 100644
--- a/.github/latest.patch
+++ b/.github/latest.patch
@@ -4,8 +4,8 @@
     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}/install
-+     wget -qO- $(wget -qO- https://github.com/SymbiFlow/f4pga-arch-defs/releases/download/latest/symbiflow-${PKG}-latest) | tar -xJC $F4PGA_INSTALL_DIR/${FPGA_FAM}/install
+-     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}
     done
 
  If the above commands exited without errors, you have successfully installed and configured your working environment.
diff --git a/common/requirements.txt b/common/requirements.txt
index 546f050..bdcbacd 100644
--- a/common/requirements.txt
+++ b/common/requirements.txt
@@ -15,4 +15,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 python-constraint
-https://github.com/chipsalliance/f4pga/archive/cad8afe0842cd73f5b73949fa12eab1fda326055.zip#subdirectory=f4pga
+https://github.com/chipsalliance/f4pga/archive/e9a520a17a00cfd268f8ee549340aaa297b63da5.zip#subdirectory=f4pga
diff --git a/docs/building-examples.rst b/docs/building-examples.rst
index af3abae..9b504d4 100644
--- a/docs/building-examples.rst
+++ b/docs/building-examples.rst
@@ -34,7 +34,6 @@ Next, prepare the environment:
 .. code-block:: bash
    :name: conda-prep-env
 
-   export PATH="$F4PGA_INSTALL_DIR/$FPGA_FAM/install/bin:$PATH";
    source "$F4PGA_INSTALL_DIR/$FPGA_FAM/conda/etc/profile.d/conda.sh"
 
 Finally, enter your working Conda environment:
diff --git a/docs/getting.rst b/docs/getting.rst
index 4a4081f..43ab7df 100644
--- a/docs/getting.rst
+++ b/docs/getting.rst
@@ -120,10 +120,10 @@ 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
-   mkdir -p $F4PGA_INSTALL_DIR/$FPGA_FAM/install
+   mkdir -p $F4PGA_INSTALL_DIR/$FPGA_FAM
 
-   F4PGA_TIMESTAMP='20220729-181657'
-   F4PGA_HASH='7833050'
+   F4PGA_TIMESTAMP='20220803-160711'
+   F4PGA_HASH='df6d9e5'
 
    case $FPGA_FAM in
      xc7)
@@ -135,7 +135,7 @@ Next, setup Conda and your system's environment, and download architecture defin
    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}/install
+     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
 
 If the above commands exited without errors, you have successfully installed and configured your working environment.

From 4cfab2ee9375d21f7fdfb01120c15f4d57c9ec75 Mon Sep 17 00:00:00 2001
From: Unai Martinez-Corral <umartinezcorral@antmicro.com>
Date: Thu, 4 Aug 2022 07:29:46 +0200
Subject: [PATCH 2/2] eos-s3/btn_counter/Makefile: add missing jlink dump

Signed-off-by: Unai Martinez-Corral <umartinezcorral@antmicro.com>
---
 eos-s3/btn_counter/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eos-s3/btn_counter/Makefile b/eos-s3/btn_counter/Makefile
index 3fa806c..d989c15 100644
--- a/eos-s3/btn_counter/Makefile
+++ b/eos-s3/btn_counter/Makefile
@@ -11,6 +11,7 @@ all:
 	  -v btn_counter.v \
 	  -t top \
 	  -p chandalar.pcf \
+	  -dump jlink \
 	  -dump openocd \
 	  -dump header \
 	  -dump binary