From 10401ffeeb75c509f27e298c8996c20b231c8502 Mon Sep 17 00:00:00 2001 From: Stefan Altorfer Date: Thu, 20 Feb 2025 08:59:05 +0100 Subject: [PATCH] Copy PDI instead of BIF The BIF is used by bootgen to create the PDI, the actual device image The segmented configuration option generates multiple PDI files --- edalize/templates/vivado/vivado-run.tcl.j2 | 2 +- edalize/tools/templates/vivado/vivado-run.tcl.j2 | 2 +- tests/test_vivado/board_file/test_vivado_0_run.tcl | 2 +- tests/test_vivado/edif_netlist/test_vivado_0_run.tcl | 2 +- .../edif_netlist_no_link_design/test_vivado_0_run.tcl | 2 +- tests/test_vivado/minimal/test_vivado_minimal_0_run.tcl | 2 +- tests/test_vivado/test_vivado_0_run.tcl | 2 +- tests/test_vivado/yosys/test_vivado_yosys_0_run.tcl | 2 +- tests/tools/vivado/design_run.tcl | 2 +- tests/tools/vivado/tags/design_run.tcl | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/edalize/templates/vivado/vivado-run.tcl.j2 b/edalize/templates/vivado/vivado-run.tcl.j2 index 2ab676a1..acc95da7 100644 --- a/edalize/templates/vivado/vivado-run.tcl.j2 +++ b/edalize/templates/vivado/vivado-run.tcl.j2 @@ -32,6 +32,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] } diff --git a/edalize/tools/templates/vivado/vivado-run.tcl.j2 b/edalize/tools/templates/vivado/vivado-run.tcl.j2 index 9de47df5..217d350a 100644 --- a/edalize/tools/templates/vivado/vivado-run.tcl.j2 +++ b/edalize/tools/templates/vivado/vivado-run.tcl.j2 @@ -31,6 +31,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] } diff --git a/tests/test_vivado/board_file/test_vivado_0_run.tcl b/tests/test_vivado/board_file/test_vivado_0_run.tcl index 73d1257b..58a95d17 100644 --- a/tests/test_vivado/board_file/test_vivado_0_run.tcl +++ b/tests/test_vivado/board_file/test_vivado_0_run.tcl @@ -31,6 +31,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] } diff --git a/tests/test_vivado/edif_netlist/test_vivado_0_run.tcl b/tests/test_vivado/edif_netlist/test_vivado_0_run.tcl index 73d1257b..58a95d17 100644 --- a/tests/test_vivado/edif_netlist/test_vivado_0_run.tcl +++ b/tests/test_vivado/edif_netlist/test_vivado_0_run.tcl @@ -31,6 +31,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] } diff --git a/tests/test_vivado/edif_netlist_no_link_design/test_vivado_0_run.tcl b/tests/test_vivado/edif_netlist_no_link_design/test_vivado_0_run.tcl index 73d1257b..58a95d17 100644 --- a/tests/test_vivado/edif_netlist_no_link_design/test_vivado_0_run.tcl +++ b/tests/test_vivado/edif_netlist_no_link_design/test_vivado_0_run.tcl @@ -31,6 +31,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] } diff --git a/tests/test_vivado/minimal/test_vivado_minimal_0_run.tcl b/tests/test_vivado/minimal/test_vivado_minimal_0_run.tcl index 73d1257b..58a95d17 100644 --- a/tests/test_vivado/minimal/test_vivado_minimal_0_run.tcl +++ b/tests/test_vivado/minimal/test_vivado_minimal_0_run.tcl @@ -31,6 +31,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] } diff --git a/tests/test_vivado/test_vivado_0_run.tcl b/tests/test_vivado/test_vivado_0_run.tcl index 73d1257b..58a95d17 100644 --- a/tests/test_vivado/test_vivado_0_run.tcl +++ b/tests/test_vivado/test_vivado_0_run.tcl @@ -31,6 +31,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] } diff --git a/tests/test_vivado/yosys/test_vivado_yosys_0_run.tcl b/tests/test_vivado/yosys/test_vivado_yosys_0_run.tcl index 73d1257b..58a95d17 100644 --- a/tests/test_vivado/yosys/test_vivado_yosys_0_run.tcl +++ b/tests/test_vivado/yosys/test_vivado_yosys_0_run.tcl @@ -31,6 +31,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] } diff --git a/tests/tools/vivado/design_run.tcl b/tests/tools/vivado/design_run.tcl index 73d1257b..58a95d17 100644 --- a/tests/tools/vivado/design_run.tcl +++ b/tests/tools/vivado/design_run.tcl @@ -31,6 +31,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] } diff --git a/tests/tools/vivado/tags/design_run.tcl b/tests/tools/vivado/tags/design_run.tcl index 73d1257b..58a95d17 100644 --- a/tests/tools/vivado/tags/design_run.tcl +++ b/tests/tools/vivado/tags/design_run.tcl @@ -31,6 +31,6 @@ if { [get_property PROGRESS [get_runs impl_1]] != "100%"} { # The Vivado default name is beneficial when using the GUI, as it is set as # default bitstream in the "Program Device" dialog; non-standard names need to # be selected from a file picker first. -foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] .{bit,bif}] { +foreach vivadoBitstreamFile [glob -path [file rootname [get_property DIRECTORY [current_run]]/[get_property top [current_fileset]]] *.{bit,pdi}] { file copy -force $vivadoBitstreamFile [pwd]/[current_project][file extension $vivadoBitstreamFile] }