nonfree: Integrate new internal CI setup

pulp-platform · Jan 8, 2025 · 97d0d4e · 97d0d4e
1 parent c4705f1
commit 97d0d4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cheshire.mk b/cheshire.mk
@@ -61,7 +61,7 @@ chs-clean-deps:
 ######################
 
 CHS_NONFREE_REMOTE ?= [email protected]:pulp-restricted/cheshire-nonfree.git
-CHS_NONFREE_COMMIT ?= fd3526f
+CHS_NONFREE_COMMIT ?= 147924a
 
 CHS_PHONY += chs-nonfree-init
 chs-nonfree-init:

diff --git a/target/xilinx/scripts/common.tcl b/target/xilinx/scripts/common.tcl
@@ -72,7 +72,9 @@ proc open_target {xilinx_root argc argv suffix} {
     open_hw_manager
     connect_hw_server -url $url
     # Open HW target, set JTAG frequency
-    set hw_tgt [get_hw_targets ${url}/${path}]
+    set hw_tgts [get_hw_targets ${url}/${path}]
+    # From all matching targets, choose last (most specific) one
+    set hw_tgt [lindex ${hw_tgts} [expr [llength ${hw_tgts}] - 1]]
     open_hw_target $hw_tgt
     set_property PARAM.FREQUENCY 15000000 $hw_tgt
     # Get hardware device