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.47.1 #1141

Merged
merged 10 commits into from
Feb 26, 2024
Merged

Release Candidate v2.47.1 #1141

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d085165
Wrong indentation was preventing the loop from reaching all files
marciodo Feb 23, 2024
0fd1605
Fixed typo in help message
marciodo Feb 23, 2024
b0e0c02
Provided an optional argument so the user can choose the location of …
marciodo Feb 23, 2024
fc2e5b8
Merge pull request #1139 from slaclab/ESLCOMMON-362
ruck314 Feb 23, 2024
2c342a0
adding support for Ultrascale Virtex Part Numbers in ruckus.tcl loading
ruck314 Feb 26, 2024
3475d47
Merge pull request #1140 from slaclab/salt-ruckus
ruck314 Feb 26, 2024
dba05b3
whitespace removal
ruck314 Feb 26, 2024
9ce3b4a
adding AxiStreamRingBufferTb.vhd
ruck314 Feb 26, 2024
6dbf057
fixed bug in AxiStreamRingBuffer.vhd where not logging data before ex…
ruck314 Feb 26, 2024
5320859
Merge pull request #1142 from slaclab/kek-bpm-ring-buffer-fix
ruck314 Feb 26, 2024
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
1 change: 1 addition & 0 deletions devices/AnalogDevices/ad9249/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ if { ${family} eq {artix7} ||
}

if { ${family} eq {kintexu} ||
${family} eq {virtexu} ||
${family} eq {kintexuplus} ||
${family} eq {virtexuplus} ||
${family} eq {virtexuplusHBM} ||
Expand Down
1 change: 1 addition & 0 deletions devices/AnalogDevices/ad9681/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ if { ${family} eq {artix7} ||
}

# if { ${family} eq {kintexu} ||
# ${family} eq {virtexu} ||
# ${family} eq {kintexuplus} ||
# ${family} eq {virtexuplus} ||
# ${family} eq {virtexuplusHBM} ||
Expand Down
1 change: 1 addition & 0 deletions devices/Marvell/Sgmii88E1111/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ loadSource -lib surf -dir "$::DIR_PATH/core"
set family [getFpgaArch]

if { ${family} eq {kintexu} ||
${family} eq {virtexu} ||
${family} eq {kintexuplus} ||
${family} eq {virtexuplus} ||
${family} eq {virtexuplusHBM} ||
Expand Down
1 change: 1 addition & 0 deletions devices/Ti/dp83867/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ loadSource -lib surf -dir "$::DIR_PATH/core"
set family [getFpgaArch]

if { ${family} eq {kintexu} ||
${family} eq {virtexu} ||
${family} eq {kintexuplus} ||
${family} eq {virtexuplus} ||
${family} eq {virtexuplusHBM} ||
Expand Down
3 changes: 2 additions & 1 deletion ethernet/GigEthCore/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ if { ${family} eq {virtex7} } {
loadRuckusTcl "$::DIR_PATH/gth7"
}

if { ${family} eq {kintexu} } {
if { ${family} eq {kintexu} ||
${family} eq {virtexu} } {
loadRuckusTcl "$::DIR_PATH/gthUltraScale"
loadRuckusTcl "$::DIR_PATH/lvdsUltraScale"
}
Expand Down
3 changes: 2 additions & 1 deletion ethernet/TenGigEthCore/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ if { ${family} eq {virtex7} } {
loadRuckusTcl "$::DIR_PATH/gth7"
}

if { ${family} eq {kintexu} } {
if { ${family} eq {kintexu} ||
${family} eq {virtexu} } {
loadRuckusTcl "$::DIR_PATH/gthUltraScale"
}

Expand Down
3 changes: 2 additions & 1 deletion ethernet/XauiCore/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ if { ${family} eq {virtex7} } {
loadRuckusTcl "$::DIR_PATH/gth7"
}

if { ${family} eq {kintexu} } {
if { ${family} eq {kintexu} ||
${family} eq {virtexu} } {
loadRuckusTcl "$::DIR_PATH/gthUltraScale"
}

Expand Down
3 changes: 2 additions & 1 deletion ethernet/XlauiCore/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ if { ${family} eq {virtex7} } {
loadRuckusTcl "$::DIR_PATH/gth7"
}

if { ${family} eq {kintexu} } {
if { ${family} eq {kintexu} ||
${family} eq {virtexu} } {
loadRuckusTcl "$::DIR_PATH/gthUltraScale"
}

Expand Down
1 change: 1 addition & 0 deletions protocols/clink/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ if { ${family} == "artix7" ||
}

if { ${family} eq {kintexu} ||
${family} eq {virtexu} ||
${family} eq {kintexuplus} ||
${family} eq {virtexuplus} ||
${family} eq {virtexuplusHBM} ||
Expand Down
3 changes: 2 additions & 1 deletion protocols/coaxpress/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ loadRuckusTcl "$::DIR_PATH/core"
# Get the family type
set family [getFpgaArch]

if { ${family} eq {kintexu} } {
if { ${family} eq {kintexu} ||
${family} eq {virtexu} } {
loadRuckusTcl "$::DIR_PATH/gthUs"
}

Expand Down
3 changes: 2 additions & 1 deletion protocols/pgp/pgp2b/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ if { ${family} eq {virtex7} } {
loadRuckusTcl "$::DIR_PATH/gth7"
}

if { ${family} eq {kintexu} } {
if { ${family} eq {kintexu} ||
${family} eq {virtexu} } {
loadRuckusTcl "$::DIR_PATH/gthUltraScale"
}

Expand Down
3 changes: 2 additions & 1 deletion protocols/pgp/pgp3/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ if { $::env(VIVADO_VERSION) > 0.0} {
# loadRuckusTcl "$::DIR_PATH/gth7"
# }

if { ${family} eq {kintexu} } {
if { ${family} eq {kintexu} ||
${family} eq {virtexu} } {
loadRuckusTcl "$::DIR_PATH/gthUs"
}

Expand Down
3 changes: 2 additions & 1 deletion protocols/pgp/pgp4/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ if { $::env(VIVADO_VERSION) > 0.0} {
# loadRuckusTcl "$::DIR_PATH/gth7"
# }

if { ${family} eq {kintexu} } {
if { ${family} eq {kintexu} ||
${family} eq {virtexu} } {
loadRuckusTcl "$::DIR_PATH/gthUs"
}

Expand Down
1 change: 1 addition & 0 deletions protocols/salt/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ if { ${family} eq {artix7} ||
}

if { ${family} eq {kintexu} ||
${family} eq {virtexu} ||
${family} eq {kintexuplus} ||
${family} eq {virtexuplus} ||
${family} eq {virtexuplusHBM} ||
Expand Down
1 change: 1 addition & 0 deletions protocols/ssp/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ loadSource -lib surf -dir "$::DIR_PATH/rtl"
loadSource -lib surf -sim_only -dir "$::DIR_PATH/tb"

if { ${family} eq {kintexu} ||
${family} eq {virtexu} ||
${family} eq {kintexuplus} ||
${family} eq {virtexuplus} ||
${family} eq {virtexuplusHBM} ||
Expand Down
1 change: 1 addition & 0 deletions protocols/xvc-udp/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ if { [isVersal] == true } {
}

if { ${family} eq {kintexu} ||
${family} eq {virtexu} ||
${family} eq {kintexuplus} ||
${family} eq {virtexuplus} ||
${family} eq {virtexuplusHBM} ||
Expand Down
58 changes: 34 additions & 24 deletions scripts/apply_slac_license.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,48 +100,58 @@ def updateFile(path,module,comment,log,script):

# Check args
if len(sys.argv) < 3:
print ("Usage: apply_license.py root_dir module_name")
print ("Usage: apply_slac_license.py root_dir module_name [optional path_to_license]")
exit()

module = sys.argv[2]
path = sys.argv[1]
# Path to license is an optional argument
license_path = ""
if len(sys.argv) == 4:
license_path = sys.argv[3]

logFile = open (path + "/apply_license_log.txt","w")

# Copy license file
baseDir = os.path.realpath(__file__).split('surf')[0]
shutil.copy(baseDir+"surf/LICENSE.txt",path + "/LICENSE.txt")
if license_path != "":
# Use user defined directory
baseDir = os.path.realpath(license_path)
shutil.copy(baseDir + "/LICENSE.txt", path + "/LICENSE.txt")
else:
# Use surf default directory
baseDir = os.path.realpath(__file__).split('surf')[0]
shutil.copy(baseDir + "surf/LICENSE.txt", path + "/LICENSE.txt")

# Walk directories recursively
for root,dirs,files in os.walk(path):
for f in files:
src = "%s/%s" % (root,f)
ret = None

# Skip .svn sub-directories
if f.find(".svn") > 0:
logFile.write("Ignored: %s\n" % (src))
# Skip .svn sub-directories
if f.find(".svn") > 0:
logFile.write("Ignored: %s\n" % (src))

# VHDL
elif f.endswith(".vhd"):
updateFile(src,module,"--",logFile,False)
# VHDL
elif f.endswith(".vhd"):
updateFile(src,module,"--",logFile,False)

# C files
elif f.endswith(".h") or f.endswith(".hh") or f.endswith(".c") or f.endswith(".cc") or f.endswith(".cpp"):
updateFile(src,module,"//",logFile,False)
# C files
elif f.endswith(".h") or f.endswith(".hh") or f.endswith(".c") or f.endswith(".cc") or f.endswith(".cpp"):
updateFile(src,module,"//",logFile,False)

# Verilog, Verilog, or System Verilog
elif f.endswith(".v") or f.endswith(".vh") or f.endswith(".sv"):
updateFile(src,module,"//",logFile,False)
# Verilog, Verilog, or System Verilog
elif f.endswith(".v") or f.endswith(".vh") or f.endswith(".sv"):
updateFile(src,module,"//",logFile,False)

# TCL / XDC
elif f.endswith(".tcl") or f.endswith(".xdc"):
updateFile(src,module,"##",logFile,False)
# TCL / XDC
elif f.endswith(".tcl") or f.endswith(".xdc"):
updateFile(src,module,"##",logFile,False)

# Python
elif f.endswith(".py"):
updateFile(src,module,"##",logFile,True)
# Python
elif f.endswith(".py"):
updateFile(src,module,"##",logFile,True)

# Unknown
else:
logFile.write("Unknown: %s\n" % (src))
# Unknown
else:
logFile.write("Unknown: %s\n" % (src))
3 changes: 2 additions & 1 deletion xilinx/ruckus.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ if { ${family} eq {artix7} ||
loadRuckusTcl "$::DIR_PATH/7Series"
}

if { ${family} eq {kintexu} } {
if { ${family} eq {kintexu} ||
${family} eq {virtexu} } {
loadRuckusTcl "$::DIR_PATH/UltraScale"
}

Expand Down
Loading