From db46b3545c7e91ae6f42e3dce292d79b6fe9068a Mon Sep 17 00:00:00 2001 From: Cyril Koenig Date: Thu, 9 Jan 2025 11:59:27 +0100 Subject: [PATCH] ci: Update for FPGA --- carfield.mk | 2 +- target/xilinx/scripts/flash_spi.tcl | 2 +- target/xilinx/scripts/program.tcl | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/carfield.mk b/carfield.mk index 157f5bd1..a4992660 100644 --- a/carfield.mk +++ b/carfield.mk @@ -44,7 +44,7 @@ include $(CAR_ROOT)/bender-safed.mk ###################### CAR_NONFREE_REMOTE ?= git@iis-git.ee.ethz.ch:carfield/carfield-nonfree.git -CAR_NONFREE_COMMIT ?= f8bf7942 +CAR_NONFREE_COMMIT ?= e39aebd1 ## @section Carfield platform nonfree components ## Clone the non-free verification IP for Carfield. Some components such as CI scripts and ASIC diff --git a/target/xilinx/scripts/flash_spi.tcl b/target/xilinx/scripts/flash_spi.tcl index c5e7f470..bac8929f 100644 --- a/target/xilinx/scripts/flash_spi.tcl +++ b/target/xilinx/scripts/flash_spi.tcl @@ -8,7 +8,7 @@ open_hw_manager connect_hw_server -url $::env(XILINX_HOST):$::env(XILINX_PORT) -open_hw_target $::env(XILINX_HOST):$::env(XILINX_PORT)/$::env(XILINX_FPGA_PATH) +open_hw_target [get_hw_targets $::env(XILINX_FPGA_PATH)] set file $::env(FILE) set offset $::env(OFFSET) diff --git a/target/xilinx/scripts/program.tcl b/target/xilinx/scripts/program.tcl index bf558fae..c34148fa 100644 --- a/target/xilinx/scripts/program.tcl +++ b/target/xilinx/scripts/program.tcl @@ -9,7 +9,7 @@ puts $::env(XILINX_BIT) open_hw_manager connect_hw_server -url $::env(XILINX_HOST):$::env(XILINX_PORT) -open_hw_target $::env(XILINX_HOST):$::env(XILINX_PORT)/$::env(XILINX_FPGA_PATH) +open_hw_target [get_hw_targets $::env(XILINX_FPGA_PATH)] if {$::env(XILINX_BOARD) eq "genesys2"} { set hw_device [get_hw_devices xc7k325t_0] @@ -34,7 +34,8 @@ program_hw_devices $hw_device refresh_hw_device [lindex $hw_device 0] # Force reset -set_property OUTPUT_VALUE 1 [get_hw_probes [list *aux_reset* probe_out0] -of_objects [get_hw_vios *]] +get_hw_vios * +set_property OUTPUT_VALUE 1 [get_hw_probes [list *aux_reset* probe_out0 *probe_out2_1] -of_objects [get_hw_vios *]] commit_hw_vio [get_hw_vios *] -set_property OUTPUT_VALUE 0 [get_hw_probes [list *aux_reset* probe_out0] -of_objects [get_hw_vios *]] +set_property OUTPUT_VALUE 0 [get_hw_probes [list *aux_reset* probe_out0 *probe_out2_1] -of_objects [get_hw_vios *]] commit_hw_vio [get_hw_vios *]