From 1a96dd299c2708b4496f07dd0f3b09417490f67e Mon Sep 17 00:00:00 2001 From: Artur Kowalski Date: Wed, 11 Oct 2023 17:50:43 +0200 Subject: [PATCH 1/3] f4pga/flows: fix typos in eos-s3 config Signed-off-by: Artur Kowalski --- f4pga/flows/platforms.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/f4pga/flows/platforms.yml b/f4pga/flows/platforms.yml index c0f5033ac..4514f28b2 100644 --- a/f4pga/flows/platforms.yml +++ b/f4pga/flows/platforms.yml @@ -251,7 +251,7 @@ ql-eos-s3: bb_factor: '10' initial_pres_fac: '4.0' check_rr_graph: 'off' - pack_high_fanout_threshold: 'PB-lOGIC:18' + pack_high_fanout_threshold: 'PB-LOGIC:18' suppress_warnings: >- ${noisyWarnings},sum_pin_class:check_unbuffered_edges:load_rr_indexed_data_T_values:check_rr_node:trans_per_R:check_route:set_rr_graph_tool_comment @@ -334,7 +334,7 @@ ql-eos-s3: bb_factor: '10' initial_pres_fac: '4.0' check_rr_graph: 'off' - pack_high_fanout_threshold: 'PB-lOGIC:18' + pack_high_fanout_threshold: 'PB-LOGIC:18' suppress_warnings: >- ${noisyWarnings},sum_pin_class:check_unbuffered_edges:load_rr_indexed_data_T_values:check_rr_node:trans_per_R:check_route:set_rr_graph_tool_comment ioplace: @@ -451,7 +451,7 @@ ql-eos-s3: bb_factor: '10' initial_pres_fac: '4.0' check_rr_graph: 'off' - pack_high_fanout_threshold: 'PB-lOGIC:18' + pack_high_fanout_threshold: 'PB-LOGIC:18' suppress_warnings: >- ${noisyWarnings},sum_pin_class:check_unbuffered_edges:load_rr_indexed_data_T_values:check_rr_node:trans_per_R:check_route:set_rr_graph_tool_comment analysis: @@ -491,7 +491,7 @@ ql-eos-s3: bb_factor: '10' initial_pres_fac: '4.0' check_rr_graph: 'off' - pack_high_fanout_threshold: 'PB-lOGIC:18' + pack_high_fanout_threshold: 'PB-LOGIC:18' suppress_warnings: >- ${noisyWarnings},sum_pin_class:check_unbuffered_edges:load_rr_indexed_data_T_values:check_rr_node:trans_per_R:check_route:set_rr_graph_tool_comment fasm: From 905055c90584caaa791f7b20b0de84df2b8f6bdc Mon Sep 17 00:00:00 2001 From: Artur Kowalski Date: Wed, 11 Oct 2023 18:07:01 +0200 Subject: [PATCH 2/3] f4pga/flows: fix openocd and jlink script generation Signed-off-by: Artur Kowalski --- f4pga/flows/platforms.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/f4pga/flows/platforms.yml b/f4pga/flows/platforms.yml index 4514f28b2..eac35b3c3 100644 --- a/f4pga/flows/platforms.yml +++ b/f4pga/flows/platforms.yml @@ -536,7 +536,8 @@ ql-eos-s3: module: 'generic_script_wrapper' params: stage_name: bitstream_jlink - script: symbiflow_write_jlink + interpreter: '${python3}' + script: ['-m', 'quicklogic_fasm.bitstream_to_jlink'] outputs: bitstream_jlink: mode: file @@ -548,12 +549,13 @@ ql-eos-s3: inputs: '#1': '${:bitstream}' '#2': '${:bitstream}.jlink' - '#3': '${:iomux_jlink}' + $_UNUSED_IOMUX_JLINK: '${:iomux_jlink}' bitstream_openocd: module: 'generic_script_wrapper' params: stage_name: bitstream_openocd - script: symbiflow_write_openocd + interpreter: '${python3}' + script: ['-m', 'quicklogic_fasm.bitstream_to_openocd'] outputs: bitstream_openocd: mode: file @@ -565,7 +567,7 @@ ql-eos-s3: inputs: '#1': '${:bitstream}' '#2': '${:bitstream}.openocd' - '#3': '${:iomux_openocd}' + $_UNUSED_IOMUX_OPENOCD: '${:iomux_openocd}' bitstream_binary: module: 'generic_script_wrapper' params: From 81581387ec53dfc43d5d57e5d80f9b6925bb48c0 Mon Sep 17 00:00:00 2001 From: Artur Kowalski Date: Wed, 11 Oct 2023 18:11:22 +0200 Subject: [PATCH 3/3] f4pga/flows: fix usage of clock pads on eos-s3 Add --no-default-bitstream to qlfasm invocation, this fixes problem with clock pads not working. This follows behaviour of f4pga-arch-defs where --no-default-bitstream is always passed to qlfasm. Signed-off-by: Artur Kowalski --- f4pga/flows/platforms.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/f4pga/flows/platforms.yml b/f4pga/flows/platforms.yml index eac35b3c3..1368bcf47 100644 --- a/f4pga/flows/platforms.yml +++ b/f4pga/flows/platforms.yml @@ -512,6 +512,7 @@ ql-eos-s3: inputs: '#1': '${:fasm}' '#2': '${:eblif[noext]}.bit' + '#3': --no-default-bitstream dev-type: ql-eos-s3 values: build_dir: .