Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Candidate v2.45.4 #1129

Merged
merged 10 commits into from
Nov 30, 2023
Merged

Release Candidate v2.45.4 #1129

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
be40ef9
Enhancements to XADC rogue Device
bengineerd Oct 24, 2023
bef9014
Add paramatized pollInterval
bengineerd Oct 25, 2023
62f68a1
updating microblaze/ruckus.tcl for Vivado 2023.2
ruck314 Nov 3, 2023
db6cabc
Updating submodule lock for Vivado 2023.2 support
ruck314 Nov 7, 2023
5a9850c
Merge pull request #1126 from slaclab/vivado-2023.2
ruck314 Nov 7, 2023
abbe0df
Update Makefile
ruck314 Nov 9, 2023
ba39208
Pgp2bAxi.vhd Enchancement
ruck314 Nov 29, 2023
b55ecb7
Merge pull request #1127 from slaclab/makefile-patch
ruck314 Nov 30, 2023
46afd93
Merge pull request #1122 from slaclab/xadc-dev
ruck314 Nov 30, 2023
0cfc1e4
Merge pull request #1128 from slaclab/pgp2b-mon-update
ruck314 Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source $::env(RUCKUS_PROC_TCL)

# Check for submodule tagging
if { [info exists ::env(OVERRIDE_SUBMODULE_LOCKS)] != 1 || $::env(OVERRIDE_SUBMODULE_LOCKS) == 0 } {
if { [SubmoduleCheck {ruckus} {4.8.4} ] < 0 } {exit -1}
if { [SubmoduleCheck {ruckus} {4.9.0} ] < 0 } {exit -1}
} else {
puts "\n\n*********************************************************"
puts "OVERRIDE_SUBMODULE_LOCKS != 0"
Expand Down
3 changes: 2 additions & 1 deletion xilinx/general/microblaze/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ if { [info exists ::env(VITIS_SRC_PATH)] != 1 } {
loadSource -lib surf -path "$::DIR_PATH/generate/MicroblazeBasicCoreWrapper.vhd"

# Load the .bd file
if { $::env(VIVADO_VERSION) == 2023.1 ||
if { $::env(VIVADO_VERSION) == 2023.2 ||
$::env(VIVADO_VERSION) == 2023.1 ||
$::env(VIVADO_VERSION) == 2022.2 } {
puts "\nVivado v$::env(VIVADO_VERSION) not supported for general/microblaze\n"
exit -1
Expand Down