From 38243e1e0999c01f1da147110f8ea7787eb6ce53 Mon Sep 17 00:00:00 2001
From: Jennifer Mah <jennifer.mah@microchip.com>
Date: Wed, 10 Jul 2024 09:08:58 -0400
Subject: [PATCH] Removed the SHLS 2024.01 workaround.
---
sources/FPGA-design/BUILD_BVF_GATEWARE.tcl | 2 ++
.../components/SMARTHLS/compile_and_integrate_to_libero.tcl | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sources/FPGA-design/BUILD_BVF_GATEWARE.tcl b/sources/FPGA-design/BUILD_BVF_GATEWARE.tcl
index 782278b..22f79f4 100644
--- a/sources/FPGA-design/BUILD_BVF_GATEWARE.tcl
+++ b/sources/FPGA-design/BUILD_BVF_GATEWARE.tcl
@@ -14,6 +14,8 @@ if {[string compare [lindex $libero_release 0] "2022"] == 0 && [string compare [
puts "Libero v2023.2 detected."
} elseif {[string compare [lindex $libero_release 0] "2024"] == 0 && [string compare [lindex $libero_release 1] "1"] == 0} {
puts "Libero v2024.1 detected."
+} elseif {[string compare [lindex $libero_release 0] "2024"] == 0 && [string compare [lindex $libero_release 1] "2"] == 0} {
+ puts "Libero v2024.2 detected."
} else {
error "Incorrect Libero version detected. Please use Libero v2023.2, v2022.3 or v2024.1 to run these scripts."
}
diff --git a/sources/FPGA-design/script_support/components/SMARTHLS/compile_and_integrate_to_libero.tcl b/sources/FPGA-design/script_support/components/SMARTHLS/compile_and_integrate_to_libero.tcl
index b1f07e2..cef3b7e 100644
--- a/sources/FPGA-design/script_support/components/SMARTHLS/compile_and_integrate_to_libero.tcl
+++ b/sources/FPGA-design/script_support/components/SMARTHLS/compile_and_integrate_to_libero.tcl
@@ -18,13 +18,13 @@ set shls_path [getHlsPath]
# - The Makefile will generate and compile the RISC-V software binary and
# the Verilog hardware and integration TCL files (used below).
# - The file open command is just to pipe stdout as SmartHLS compilation advances
-set fid [open "| make" r]
+set fid [open "| shls -a soc_sw_compile_accel" r]
while {[gets $fid line] != -1} { puts $line }
close $fid
#
# Integrate SmartHLS hardware modules into the Libero project
#
-source $hlsModuleDir/hls/hls_output/scripts/shls_integrate_accels.tcl
+source $hlsModuleDir/hls_output/scripts/shls_integrate_accels.tcl
#
# Restore the working directory
--
GitLab