From c4bd69f95ddf5013bdea055dedc5d34af3efd6aa Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Tue, 2 Aug 2022 10:46:18 +0200 Subject: [PATCH 1/5] docs/building-examples: export FPGA_FAM Signed-off-by: Unai Martinez-Corral --- docs/building-examples.rst | 4 ++-- eos-s3/btn_counter/README.rst | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/building-examples.rst b/docs/building-examples.rst index c15734d..af3abae 100644 --- a/docs/building-examples.rst +++ b/docs/building-examples.rst @@ -20,14 +20,14 @@ Select your FPGA family: .. code-block:: bash :name: fpga-fam-xc7 - FPGA_FAM="xc7" + export FPGA_FAM="xc7" .. group-tab:: EOS S3 .. code-block:: bash :name: fpga-fam-eos-s3 - FPGA_FAM="eos-s3" + export FPGA_FAM="eos-s3" Next, prepare the environment: diff --git a/eos-s3/btn_counter/README.rst b/eos-s3/btn_counter/README.rst index 595017e..da0bef0 100644 --- a/eos-s3/btn_counter/README.rst +++ b/eos-s3/btn_counter/README.rst @@ -7,6 +7,4 @@ counter example, run the following command: .. code-block:: bash :name: eos-s3-counter - #FIXME: make sure FPGA_FAM is available and remove env var export - export FPGA_FAM=eos-s3 make -C btn_counter From 4f1705912f91d4cfd4e5f6f20a8136d37c08058a Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Tue, 2 Aug 2022 00:22:10 +0200 Subject: [PATCH 2/5] eos-s3/btn_counter/Makefile: cleanup Signed-off-by: Unai Martinez-Corral --- eos-s3/btn_counter/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/eos-s3/btn_counter/Makefile b/eos-s3/btn_counter/Makefile index a8c52b6..dd1658a 100644 --- a/eos-s3/btn_counter/Makefile +++ b/eos-s3/btn_counter/Makefile @@ -1,14 +1,12 @@ -mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) -current_dir := $(patsubst %/,%,$(dir $(mkfile_path))) -TOP:=top -VERILOG:=btn_counter.v -DEVICE := ql-eos-s3 -PARTNAME := PD64 -PCF:=chandalar.pcf - ifdef F4PGA_USE_DEPRECATED all: - ql_symbiflow -compile -d ${DEVICE} -P ${PARTNAME} -v ${VERILOG} -t ${TOP} -p ${PCF} + ql_symbiflow \ + -compile \ + -d ql-eos-s3 \ + -P PD64 \ + -v btn_counter.v \ + -t top \ + -p chandalar.pcf else all: f4pga -vvv build --flow ./flow.json From ecee11de8116d289dad24dd509bbd277727f6501 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral <38422348+umarcor@users.noreply.github.com> Date: Tue, 2 Aug 2022 19:02:01 +0200 Subject: [PATCH 3/5] eos-s3/btn_counter/Makefile: add comments --- eos-s3/btn_counter/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eos-s3/btn_counter/Makefile b/eos-s3/btn_counter/Makefile index dd1658a..fece24e 100644 --- a/eos-s3/btn_counter/Makefile +++ b/eos-s3/btn_counter/Makefile @@ -1,7 +1,11 @@ ifdef F4PGA_USE_DEPRECATED all: - ql_symbiflow \ - -compile \ +# -d: Device +# -P: Part name +# -v: Verilog source +# -t: Top +# -p: PCF Constrains + ql_symbiflow -compile \ -d ql-eos-s3 \ -P PD64 \ -v btn_counter.v \ From f6b9e235204584d6450df299012ad4d137254df6 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Tue, 2 Aug 2022 03:19:49 +0200 Subject: [PATCH 4/5] eos-s3/btn_counter/Makefile: dump jlink, openocd, header and binary Signed-off-by: Unai Martinez-Corral --- eos-s3/btn_counter/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eos-s3/btn_counter/Makefile b/eos-s3/btn_counter/Makefile index fece24e..8ee87e3 100644 --- a/eos-s3/btn_counter/Makefile +++ b/eos-s3/btn_counter/Makefile @@ -10,7 +10,11 @@ all: -P PD64 \ -v btn_counter.v \ -t top \ - -p chandalar.pcf + -p chandalar.pcf \ + -dump openocd \ + -dump header \ + -dump binary +>>>>>>> 3d9062c (eos-s3/btn_counter/Makefile: dump jlink, openocd, header and binary) else all: f4pga -vvv build --flow ./flow.json From ea9698e82a5c3e31b2dafa828cd20fb583dd80b4 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Tue, 2 Aug 2022 13:33:29 +0200 Subject: [PATCH 5/5] common/requirements: bump f4pga Signed-off-by: Unai Martinez-Corral --- common/requirements.txt | 2 +- eos-s3/btn_counter/Makefile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common/requirements.txt b/common/requirements.txt index 4f4c22d..546f050 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/c342fc6ff1684f3dc6072713730ac9fc574ab2f3.zip#subdirectory=f4pga +https://github.com/chipsalliance/f4pga/archive/cad8afe0842cd73f5b73949fa12eab1fda326055.zip#subdirectory=f4pga diff --git a/eos-s3/btn_counter/Makefile b/eos-s3/btn_counter/Makefile index 8ee87e3..3fa806c 100644 --- a/eos-s3/btn_counter/Makefile +++ b/eos-s3/btn_counter/Makefile @@ -14,7 +14,6 @@ all: -dump openocd \ -dump header \ -dump binary ->>>>>>> 3d9062c (eos-s3/btn_counter/Makefile: dump jlink, openocd, header and binary) else all: f4pga -vvv build --flow ./flow.json