diff --git a/.cargo/config.toml.template b/.cargo/config.toml.template index 5092f1a..ed257d4 100644 --- a/.cargo/config.toml.template +++ b/.cargo/config.toml.template @@ -2,7 +2,7 @@ # The following two env variables need to be set for the supplied runner.sh script to work. # Absolute path to the Vitis install directory. -# AMD_TOOLS = "/tools/Xilinx/Vitis/2024.1" +# AMD_TOOLS = "/tools/2025.2/Vitis" # Absolute path to the PS7 initialization TCL script. # TCL_INIT_SCRIPT = "/home/$user/$project/$sdt_dir/ps7_init.tcl" diff --git a/zedboard-fpga-design/README.md b/zedboard-fpga-design/README.md index 2533876..44ec137 100644 --- a/zedboard-fpga-design/README.md +++ b/zedboard-fpga-design/README.md @@ -10,9 +10,9 @@ hardware design to other boards with modifications. - [Vivado installation](https://www.xilinx.com/support/download/index.html/content/xilinx/en/downloadNav/vivado-design-tools.html) or [Vitis installation](https://www.xilinx.com/support/download/index.html/content/xilinx/en/downloadNav/vitis.html) - which includes Vivado. This example design was created with/for Vivado 2024.1, but also might work + which includes Vivado. This example design was created with/for Vivado 2025.2, but also might work + for newer versions. You might have to manually adjust some variables in `src/zedboard-bd.tcl` for newer versions. -- [Zedboard board files](https://github.com/Digilent/vivado-boards) added to the Vivado installation. # Loading the project and the block design with the GUI @@ -54,7 +54,7 @@ named `sdt_out` for a hardware description files `zedboard-rust/zedboard-rust.xs assuming that the Vitis tool suite is installed at `/tools/Xilinx/Vitis/2024.1`: ```sh -export AMD_TOOLS="/tools/Xilinx/Vitis/2024.1" +export AMD_TOOLS="/tools/2025.2/Vitis" ./sdtgen.py -x ./zedboard-rust/zedboard-rust.xsa ``` diff --git a/zedboard-fpga-design/src/zedboard-bd.tcl b/zedboard-fpga-design/src/zedboard-bd.tcl index 1199485..fbc97a2 100644 --- a/zedboard-fpga-design/src/zedboard-bd.tcl +++ b/zedboard-fpga-design/src/zedboard-bd.tcl @@ -20,7 +20,7 @@ set script_folder [_tcl::get_script_folder] ################################################################ # Check if script is running in correct Vivado version. ################################################################ -set scripts_vivado_version 2024.1 +set scripts_vivado_version 2025.2 set current_vivado_version [version -short] if { [string first $scripts_vivado_version $current_vivado_version] == -1 } { @@ -57,7 +57,7 @@ if { [string first $scripts_vivado_version $current_vivado_version] == -1 } { set list_projs [get_projects -quiet] if { $list_projs eq "" } { create_project project_1 myproj -part xc7z020clg484-1 - set_property BOARD_PART digilentinc.com:zedboard:part0:1.1 [current_project] + # set_property BOARD_PART digilentinc.com:zedboard:part0:1.1 [current_project] } diff --git a/zedboard-fpga-design/zedboard-rust.tcl b/zedboard-fpga-design/zedboard-rust.tcl index a2e5b83..00b5b13 100644 --- a/zedboard-fpga-design/zedboard-rust.tcl +++ b/zedboard-fpga-design/zedboard-rust.tcl @@ -131,7 +131,7 @@ set proj_dir [get_property directory [current_project]] # Set project properties set obj [current_project] -set_property -name "board_part" -value "digilentinc.com:zedboard:part0:1.1" -objects $obj +# set_property -name "board_part" -value "digilentinc.com:zedboard:part0:1.1" -objects $obj set_property -name "default_lib" -value "xil_defaultlib" -objects $obj set_property -name "enable_resource_estimation" -value "0" -objects $obj set_property -name "enable_vhdl_2008" -value "1" -objects $obj @@ -221,10 +221,10 @@ catch { # Create 'synth_1' run (if not found) if {[string equal [get_runs -quiet synth_1] ""]} { - create_run -name synth_1 -part xc7z020clg484-1 -flow {Vivado Synthesis 2024} -strategy "Vivado Synthesis Defaults" -report_strategy {No Reports} -constrset constrs_1 + create_run -name synth_1 -part xc7z020clg484-1 -flow {Vivado Synthesis 2025} -strategy "Vivado Synthesis Defaults" -report_strategy {No Reports} -constrset constrs_1 } else { set_property strategy "Vivado Synthesis Defaults" [get_runs synth_1] - set_property flow "Vivado Synthesis 2024" [get_runs synth_1] + set_property flow "Vivado Synthesis 2025" [get_runs synth_1] } set obj [get_runs synth_1] set_property set_report_strategy_name 1 $obj @@ -248,10 +248,10 @@ current_run -synthesis [get_runs synth_1] # Create 'impl_1' run (if not found) if {[string equal [get_runs -quiet impl_1] ""]} { - create_run -name impl_1 -part xc7z020clg484-1 -flow {Vivado Implementation 2024} -strategy "Vivado Implementation Defaults" -report_strategy {No Reports} -constrset constrs_1 -parent_run synth_1 + create_run -name impl_1 -part xc7z020clg484-1 -flow {Vivado Implementation 2025} -strategy "Vivado Implementation Defaults" -report_strategy {No Reports} -constrset constrs_1 -parent_run synth_1 } else { set_property strategy "Vivado Implementation Defaults" [get_runs impl_1] - set_property flow "Vivado Implementation 2024" [get_runs impl_1] + set_property flow "Vivado Implementation 2025" [get_runs impl_1] } set obj [get_runs impl_1] set_property set_report_strategy_name 1 $obj