From a34b942a687460f02d50f8d613ecf1db0d31bfe6 Mon Sep 17 00:00:00 2001
From: Mariusz Glebocki <mglebocki@antmicro.com>
Date: Mon, 13 Jul 2020 14:44:55 +0200
Subject: [PATCH 1/2] Update Quicklogic toolchain

Signed-off-by: Mariusz Glebocki <mglebocki@antmicro.com>
---
 README.md                | 16 ++++++----------
 examples/eos-s3/Makefile | 38 ++++++--------------------------------
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index 5a6a4a4..3a6af15 100644
--- a/README.md
+++ b/README.md
@@ -44,13 +44,9 @@ conda deactivate
 For the EOS S3 devices:
 
 ```bash
-INSTALL_DIR="/opt/symbiflow/eos-s3"
-bash conda_installer.sh -b -p $INSTALL_DIR/conda && rm conda_installer.sh
-source "$INSTALL_DIR/conda/etc/profile.d/conda.sh"
-conda env create -f examples/eos-s3/environment.yml
-conda activate eos-s3
-wget -qO- https://storage.googleapis.com/symbiflow-arch-defs-install/quicklogic/arch-defs-install-eos-s3-f7880e1f.tar.xz | tar -xJ -C $INSTALL_DIR
-conda deactivate
+export INSTALL_DIR="/opt/symbiflow/eos-s3"
+wget 'https://github.com/QuickLogic-Corp/quicklogic-fpga-toolchain/releases/download/v1.1.0_Beta/Symbiflow_v1.1.0.gz.run'
+bash Symbiflow_v1.1.0.gz.run
 ```
 
 ## Build Example Designs
@@ -105,10 +101,10 @@ To build the example, run the following commands:
 
 ```bash
 export INSTALL_DIR="/opt/symbiflow/eos-s3"
-# adding symbiflow toolchain binaries to PATH
-export PATH="$INSTALL_DIR/install/bin:$PATH"
+export PATH="$INSTALL_DIR/install/bin:$INSTALL_DIR/install/bin/python:$PATH"
 source "$INSTALL_DIR/conda/etc/profile.d/conda.sh"
-conda activate eos-s3
+conda activate
+
 git clone https://github.com/SymbiFlow/symbiflow-examples && cd symbiflow-examples
 pushd examples/eos-s3 && make && popd
 ```
diff --git a/examples/eos-s3/Makefile b/examples/eos-s3/Makefile
index 6d9795b..f33de95 100644
--- a/examples/eos-s3/Makefile
+++ b/examples/eos-s3/Makefile
@@ -1,36 +1,10 @@
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 current_dir := $(patsubst %/,%,$(dir $(mkfile_path)))
 TOP:=top
-VERILOG:=${current_dir}/btn_counter.v
-PARTNAME:= ql-eos-s3_wlcsp
-DEVICE  := ql-eos-s3_wlcsp
-BITSTREAM_DEVICE := ql-eos-s3_wlcsp
-PCF:=${current_dir}/chandalar.pcf
-BUILDDIR:=build
-
-all: ${BUILDDIR}/${TOP}.bit
-
-${BUILDDIR}:
-	mkdir ${BUILDDIR}
-
-${BUILDDIR}/${TOP}.eblif: | ${BUILDDIR}
-	cd ${BUILDDIR} && synth -t ${TOP} -v ${VERILOG} -d ${BITSTREAM_DEVICE} -p ${PARTNAME} -P ${PCF}
-
-${BUILDDIR}/${TOP}.net: ${BUILDDIR}/${TOP}.eblif
-	cd ${BUILDDIR} && pack -e ${TOP}.eblif -d ${DEVICE}
-
-${BUILDDIR}/${TOP}.place: ${BUILDDIR}/${TOP}.net
-	cd ${BUILDDIR} && place -e ${TOP}.eblif -d ${DEVICE} -p ${PCF} -n ${TOP}.net -P ${PARTNAME}
-
-${BUILDDIR}/${TOP}.route: ${BUILDDIR}/${TOP}.place
-	cd ${BUILDDIR} && route -e ${TOP}.eblif -d ${DEVICE}
-
-${BUILDDIR}/${TOP}.fasm: ${BUILDDIR}/${TOP}.route
-	cd ${BUILDDIR} && write_fasm -e ${TOP}.eblif -d ${DEVICE}
-
-${BUILDDIR}/${TOP}.bit: ${BUILDDIR}/${TOP}.fasm
-	cd ${BUILDDIR} && write_bitstream -d ${BITSTREAM_DEVICE} -f ${TOP}.fasm -p ${PARTNAME} -b ${TOP}.bit
-
-clean:
-	rm -rf ${BUILDDIR}
+VERILOG:=btn_counter.v
+DEVICE := ql-eos-s3
+PARTNAME := pd64
+PCF:=chandalar.pcf
 
+all:
+	ql_symbiflow -compile -d ${DEVICE} -P ${PARTNAME} -v ${VERILOG} -t ${TOP} -p ${PCF}

From 5b5546918e993ad90e9b61359ccde51717c7cccf Mon Sep 17 00:00:00 2001
From: Mariusz Glebocki <mglebocki@antmicro.com>
Date: Mon, 13 Jul 2020 17:15:22 +0200
Subject: [PATCH 2/2] eos-s3: update IO names

Signed-off-by: Mariusz Glebocki <mglebocki@antmicro.com>
---
 examples/eos-s3/chandalar.pcf    | 10 +++++-----
 examples/eos-s3/quickfeather.pcf | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/eos-s3/chandalar.pcf b/examples/eos-s3/chandalar.pcf
index e5ea076..31331dd 100644
--- a/examples/eos-s3/chandalar.pcf
+++ b/examples/eos-s3/chandalar.pcf
@@ -1,5 +1,5 @@
-set_io clk      FBIO_0
-set_io led(0)   FBIO_21
-set_io led(1)   FBIO_22
-set_io led(2)   FBIO_26
-set_io led(3)   FBIO_18
+set_io clk      A3
+set_io led(0)   H7
+set_io led(1)   G7
+set_io led(2)   F6
+set_io led(3)   E8
diff --git a/examples/eos-s3/quickfeather.pcf b/examples/eos-s3/quickfeather.pcf
index fe23975..b9a2aef 100644
--- a/examples/eos-s3/quickfeather.pcf
+++ b/examples/eos-s3/quickfeather.pcf
@@ -1,5 +1,5 @@
-set_io clk      FBIO_6
-set_io led(0)   FBIO_22
-set_io led(1)   FBIO_21
-set_io led(2)   FBIO_18
-set_io led(3)   FBIO_30
+set_io clk      63
+set_io led(0)   34
+set_io led(1)   39
+set_io led(2)   38
+set_io led(3)   25