From 4184daa0c585998575220430e69a8898eb932057 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Fri, 19 Aug 2022 19:43:34 +0200 Subject: [PATCH 1/9] scripts/prepare_environment: bump arch-defs packages Signed-off-by: Unai Martinez-Corral --- scripts/prepare_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_environment.sh b/scripts/prepare_environment.sh index 3ad7f3b..ffc63ea 100755 --- a/scripts/prepare_environment.sh +++ b/scripts/prepare_environment.sh @@ -54,8 +54,8 @@ echo '::group::Install arch-defs' mkdir -p "$F4PGA_INSTALL_DIR_FAM" -F4PGA_TIMESTAMP='20220803-160711' -F4PGA_HASH='df6d9e5' +F4PGA_TIMESTAMP='20220805-074252' +F4PGA_HASH='ee6c747' case "$FPGA_FAM" in xc7) PACKAGES='install-xc7 xc7a50t_test';; From dd949941672c34038bc4da9471dd98bee8047fe0 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Fri, 19 Aug 2022 19:49:14 +0200 Subject: [PATCH 2/9] scripts/prepare_environment: bump arch-defs packages Signed-off-by: Unai Martinez-Corral --- scripts/prepare_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_environment.sh b/scripts/prepare_environment.sh index ffc63ea..5784147 100755 --- a/scripts/prepare_environment.sh +++ b/scripts/prepare_environment.sh @@ -54,8 +54,8 @@ echo '::group::Install arch-defs' mkdir -p "$F4PGA_INSTALL_DIR_FAM" -F4PGA_TIMESTAMP='20220805-074252' -F4PGA_HASH='ee6c747' +F4PGA_TIMESTAMP='20220805-132100' +F4PGA_HASH='635a2ac' case "$FPGA_FAM" in xc7) PACKAGES='install-xc7 xc7a50t_test';; From be2151878b37f34875cd7058fdfb1fb08c549d83 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Fri, 19 Aug 2022 19:50:07 +0200 Subject: [PATCH 3/9] scripts/prepare_environment: bump arch-defs packages Signed-off-by: Unai Martinez-Corral --- scripts/prepare_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_environment.sh b/scripts/prepare_environment.sh index 5784147..e80e601 100755 --- a/scripts/prepare_environment.sh +++ b/scripts/prepare_environment.sh @@ -54,8 +54,8 @@ echo '::group::Install arch-defs' mkdir -p "$F4PGA_INSTALL_DIR_FAM" -F4PGA_TIMESTAMP='20220805-132100' -F4PGA_HASH='635a2ac' +F4PGA_TIMESTAMP='20220808-141716' +F4PGA_HASH='69c0fae' case "$FPGA_FAM" in xc7) PACKAGES='install-xc7 xc7a50t_test';; From 1c104b4a182e885cfe6260159b8d6b373bd16b25 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Fri, 19 Aug 2022 19:50:49 +0200 Subject: [PATCH 4/9] scripts/prepare_environment: bump arch-defs packages Signed-off-by: Unai Martinez-Corral --- scripts/prepare_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_environment.sh b/scripts/prepare_environment.sh index e80e601..ffd6eb3 100755 --- a/scripts/prepare_environment.sh +++ b/scripts/prepare_environment.sh @@ -54,8 +54,8 @@ echo '::group::Install arch-defs' mkdir -p "$F4PGA_INSTALL_DIR_FAM" -F4PGA_TIMESTAMP='20220808-141716' -F4PGA_HASH='69c0fae' +F4PGA_TIMESTAMP='20220810-121459' +F4PGA_HASH='a80029f' case "$FPGA_FAM" in xc7) PACKAGES='install-xc7 xc7a50t_test';; From 38ccd7a4edd6ce1b38ff98cec3ae3e4716da8dd8 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Fri, 19 Aug 2022 19:51:28 +0200 Subject: [PATCH 5/9] scripts/prepare_environment: bump arch-defs packages Signed-off-by: Unai Martinez-Corral --- scripts/prepare_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_environment.sh b/scripts/prepare_environment.sh index ffd6eb3..487a1be 100755 --- a/scripts/prepare_environment.sh +++ b/scripts/prepare_environment.sh @@ -54,8 +54,8 @@ echo '::group::Install arch-defs' mkdir -p "$F4PGA_INSTALL_DIR_FAM" -F4PGA_TIMESTAMP='20220810-121459' -F4PGA_HASH='a80029f' +F4PGA_TIMESTAMP='20220815-115001' +F4PGA_HASH='ad45cc8' case "$FPGA_FAM" in xc7) PACKAGES='install-xc7 xc7a50t_test';; From a3a15f8cadddcc576fb1a44ab7ad3adc0096a427 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Fri, 19 Aug 2022 19:52:09 +0200 Subject: [PATCH 6/9] scripts/prepare_environment: bump arch-defs packages Signed-off-by: Unai Martinez-Corral --- scripts/prepare_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare_environment.sh b/scripts/prepare_environment.sh index 487a1be..989d876 100755 --- a/scripts/prepare_environment.sh +++ b/scripts/prepare_environment.sh @@ -54,8 +54,8 @@ echo '::group::Install arch-defs' mkdir -p "$F4PGA_INSTALL_DIR_FAM" -F4PGA_TIMESTAMP='20220815-115001' -F4PGA_HASH='ad45cc8' +F4PGA_TIMESTAMP='20220818-143856' +F4PGA_HASH='24e8f73' case "$FPGA_FAM" in xc7) PACKAGES='install-xc7 xc7a50t_test';; From eb25aa6b2b783cf6bcfc63645e22d12876da34af Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Fri, 19 Aug 2022 19:54:42 +0200 Subject: [PATCH 7/9] docs/changes: add 7 Signed-off-by: Unai Martinez-Corral --- docs/changes.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/docs/changes.yml b/docs/changes.yml index 236747d..16fa6c8 100644 --- a/docs/changes.yml +++ b/docs/changes.yml @@ -23,10 +23,10 @@ - `f4pga build` now supports Lattice's NX devices. -6: - examples: 78b5e8f2845985be0c63631324adc33756de642d - arch-defs: 20220803-160711@df6d9e5 - f4pga: e9a520a17a00cfd268f8ee549340aaa297b63da5 +7: + examples: chipsalliance/f4pga-examples#359 + arch-defs: 20220818-143856@24e8f73 + f4pga: 2d8d85706ecc7a72e17078ea903e2751022825da <<: &tarballs-consistent tarballs: xc7: @@ -35,6 +35,22 @@ eos-s3: - symbiflow-install-ql-*-tar-xz - symbiflow-ql-eos-s3_wlcsp-*-tar-xz + description: | + * Yosys TCL scripts from f4pga-arch-defs tarballs were moved to f4pga as ``f4pga.wrappers.tcl``. + + * Use ``--`` (instead of ``-a|--additional_vpr_options``) to provide additional VPR arguments to the (deprecated) + ``symbiflow_*`` entrypoints. + + * Setting ``FPGA_FAM`` before installing ``f4pga`` is not required anymore. + + * Sources related to ``f4pga build`` were moved to submodule ``f4pga.flows``. + + +6: + examples: 78b5e8f2845985be0c63631324adc33756de642d + arch-defs: 20220803-160711@df6d9e5 + f4pga: e9a520a17a00cfd268f8ee549340aaa297b63da5 + <<: *tarballs-consistent description: | * Tarballs from f4pga-arch-defs now include usable environment and requirements files which allow bootstraping minimal Conda environments. From 1b15ba70bb8e1e31e7f77626579091e9e72af60f Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Sat, 20 Aug 2022 12:33:04 +0200 Subject: [PATCH 8/9] docs/changes/repo_url: handle PR refs Signed-off-by: Unai Martinez-Corral --- docs/changes.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/changes.py b/docs/changes.py index 537607c..1a8660f 100644 --- a/docs/changes.py +++ b/docs/changes.py @@ -28,11 +28,17 @@ ROOT = Path(__file__).resolve().parent def repo_url(repo, value): ref = value + url = 'commit' + parts = None if '@' in value: - parts = value.split('@') - repo = parts[0] - ref = parts[1] - return f'https://github.com/{repo}/commit/{ref}' + parts = value.split('@') + if '#' in value: + parts = value.split('#') + if parts is not None: + url = 'pull' + repo = parts[0] + ref = parts[1] + return f'https://github.com/{repo}/{url}/{ref}' def generate_changes_inc(): From 7c918ab0f073aa223a1f36bd5544547cce5386f0 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral Date: Mon, 29 Aug 2022 12:07:31 +0200 Subject: [PATCH 9/9] docs/changes/7: update ref Signed-off-by: Unai Martinez-Corral --- docs/changes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changes.yml b/docs/changes.yml index 16fa6c8..7a2b16f 100644 --- a/docs/changes.yml +++ b/docs/changes.yml @@ -24,7 +24,7 @@ 7: - examples: chipsalliance/f4pga-examples#359 + examples: 954a21090b14808b50d259b552e353b69f0ddae0 arch-defs: 20220818-143856@24e8f73 f4pga: 2d8d85706ecc7a72e17078ea903e2751022825da <<: &tarballs-consistent