Commit 21fb473a authored by Peter Jansweijer's avatar Peter Jansweijer

change variable name 'device' into 'proj_device'.

Plain 'device' is too generic an might get changed in nested scripts causing failure.
parent 0dd5c893
......@@ -13,8 +13,8 @@ set spec7_design spec7_blink
# SELECT DEVICE TO BUILD:
# ====================================================
# SPEC7 equipped with ZYNQ XC7Z035FBG676-1 (speed grade -1 has lowest performance)
set device xc7z035fbg676-1
#set device xc7z030fbg676-1
set proj_device xc7z035fbg676-1
#set proj_device xc7z030fbg676-1
# ====================================================
set proj_name spec7_blink
......
......@@ -21,8 +21,8 @@ set spec7_design spec7_ref_top
# SELECT DEVICE TO BUILD:
# ====================================================
# SPEC7 equipped with ZYNQ XC7Z035FBG676-1 (speed grade -1 has lowest performance)
set device xc7z035fbg676-1
#set device xc7z030fbg676-1
set proj_device xc7z035fbg676-1
#set proj_device xc7z030fbg676-1
# ====================================================
# ====================================================
......
......@@ -17,8 +17,8 @@ set version ""
# SELECT DEVICE TO BUILD:
# ====================================================
# SPEC7 equipped with ZYNQ XC7Z035FBG676-1 (speed grade -1 has lowest performance)
set device xc7z035fbg676-1
#set device xc7z030fbg676-1
set proj_device xc7z035fbg676-1
#set proj_device xc7z030fbg676-1
# ====================================================
set proj_name spec7_tandem_boot_top
......
......@@ -57,7 +57,7 @@ close_project -quiet
file delete -force $proj_dir
#file mkdir $proj_dir
create_project -force -part $device $proj_name ./$proj_dir
create_project -force -part $proj_device $proj_name ./$proj_dir
# work_directory is *full* path project directory.
# Vivado doesn't seem to accept relative paths!?
set work_directory [get_property DIRECTORY [current_project]]
......@@ -177,7 +177,7 @@ close_design
# Generate a new name for .bit, .mmi and xsa file and copy to project directory.
# Also create a copy of these files in the work directory that can be picked up by .gitlab-ci.yml
# Create a senible name including date and time
set bitfile_name ${spec7_design}${version}_[string range $device 3 6]_[clock format [clock seconds] -format %y%m%d_%H%M]
set bitfile_name ${spec7_design}${version}_[string range $proj_device 3 6]_[clock format [clock seconds] -format %y%m%d_%H%M]
file copy ./work/${proj_name}.runs/impl_1/${proj_name}.bit ../${bitfile_name}.bit
file copy ./work/${proj_name}.runs/impl_1/${proj_name}.bit ./work/${bitfile_name}.bit
if [file exists ./${proj_name}.mmi] {
......@@ -201,7 +201,7 @@ cd $syn_dir
set git_log_fp [open ../${bitfile_name}.log w]
puts $git_log_fp "Build with following project properties:"
puts $git_log_fp "spec7_design = $spec7_design"
puts $git_log_fp "device = $device"
puts $git_log_fp "device = $proj_device"
if [info exists pps_in] {
puts $git_log_fp "pps_in = $pps_in"
}
......
......@@ -101,7 +101,7 @@ while {[gets $fileID line] >= 0 } {
puts $fileID_mmi " <Config>"
# Important! Option Name must be "Part", otherwise update_mem fails:
# ERROR: [Updatemem 57-44] device is not supported by update_mem.
puts $fileID_mmi " <Option Name=\"Part\" Val=\"${device}\"/>"
puts $fileID_mmi " <Option Name=\"Part\" Val=\"${proj_device}\"/>"
puts $fileID_mmi " </Config>"
# Important! DRC section must be present, otherwise update_mem fails:
# Unknown exception.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment