Merge pull request #16 from analogdevicesinc/fix-adi-mm-tt-demo

Fix ADI_MM_TT demo

Author: tfcollins

hdl_wa_bsp/vendor/AnalogDevices/vivado/library/analog.com_user_util_mux_1.0.zip

@@ -1,21 +1,21 @@
 set ad_hdl_dir    	[pwd]
 set ad_phdl_dir   	[pwd]
-set proj_dir		$ad_hdl_dir/projects/adrv9361z7035/ccbox_lvds
+set proj_dir		$ad_hdl_dir/projects/adrv9361z7035/ccbox_lvds_modem
 
 source $ad_hdl_dir/projects/scripts/adi_project.tcl
 source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
 set p_device "xc7z035ifbg676-2L"
-adi_project_xilinx adrv9361z7035_ccbox_lvds $proj_dir
-adi_project_files adrv9361z7035_ccbox_lvds [list \
+adi_project_xilinx adrv9361z7035_ccbox_lvds_modem $proj_dir config_rx_tx.tcl
+adi_project_files adrv9361z7035_ccbox_lvds_modem [list \
   "$ad_hdl_dir/library/xilinx/common/ad_iobuf.v" \
   "$ad_hdl_dir/library/common/ad_adl5904_rst.v" \
   "$ad_hdl_dir/projects/adrv9361z7035/common/adrv9361z7035_constr.xdc" \
   "$ad_hdl_dir/projects/adrv9361z7035/common/adrv9361z7035_constr_lvds.xdc" \
   "$ad_hdl_dir/projects/adrv9361z7035/common/ccbox_constr.xdc" \
   "system_top.v" ]
 
-adi_project_run adrv9361z7035_ccbox_lvds
+adi_project_run adrv9361z7035_ccbox_lvds_modem
 
 # Copy the boot file to the root directory
 file copy -force $proj_dir/boot $ad_hdl_dir/boot

hdl_wa_bsp/vendor/AnalogDevices/vivado/projects/adrv9361z7035/ccbox_lvds_modem/system_project_rx_tx.tcl

@@ -83,6 +83,7 @@ proc adi_project_xilinx {project_name project_dir update_tcl {mode 0}} {
   }
 
   #Added
+  set project_name_org $project_name
   set project_name vivado_prj
 
   set VIVADO_VERSION [version -short]
@@ -132,8 +133,10 @@ proc adi_project_xilinx {project_name project_dir update_tcl {mode 0}} {
   #Added
   create_bd_design "system"
   source $project_dir/system_bd.tcl
-  source $project_dir/$update_tcl
-  
+  if {$project_name_org != "adrv9361z7035_ccbox_lvds_modem"} {
+    source $project_dir/$update_tcl
+  }
+
   regenerate_bd_layout
   save_bd_design
   validate_bd_design