stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

scuwdt : added namespace for all HSI TCL commands.

Browse source 
Signed-off-by: Nava kishore Manne <navam@xilinx.com>
This commit is contained in:
Nava kishore Manne 2015-04-09 13:32:08 +05:30
parent 04e818ac3d
commit d72314f618
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
XilinxProcessorIPLib/drivers/scuwdt/data/scuwdt_tapp.tcl
View file

@ -98,20 +98,15 @@ proc gen_testfunc_call {swproj mhsinst} {
} }
set ipname [get_property NAME $mhsinst] set ipname [get_property NAME $mhsinst]
<<<<<<< HEAD
set deviceid [::hsm::utils::get_ip_param_name $mhsinst "DEVICE_ID"]
set stdout [get_property CONFIG.STDOUT [get_os]]
=======
set deviceid [::hsi::utils::get_ip_param_name $mhsinst "DEVICE_ID"] set deviceid [::hsi::utils::get_ip_param_name $mhsinst "DEVICE_ID"]
set stdout [get_property CONFIG.STDOUT [hsi::get_os]] set stdout [get_property CONFIG.STDOUT [hsi::get_os]]
>>>>>>> scuwdt : added namespace for all HSI TCL commands.
if { $stdout == "" || $stdout == "none" } { if { $stdout == "" || $stdout == "none" } {
set hasStdout 0 set hasStdout 0
} else { } else {
set hasStdout 1 set hasStdout 1
} }
set isintr [::hsm::utils::is_ip_interrupting_current_proc $mhsinst] set isintr [::hsi::utils::is_ip_interrupting_current_proc $mhsinst]
set intcvar intc set intcvar intc