From 904528b4bdf26b83e1f07ce8ab51680328e92a0c Mon Sep 17 00:00:00 2001 From: Nava kishore Manne Date: Mon, 13 Jul 2015 17:38:07 +0530 Subject: [PATCH] lib:sw_apps:get_cells is changed to ::hsi::get_cells Signed-off-by: Nava kishore Manne --- .../data/freertos_hello_world.tcl | 6 +++--- .../openamp_echo_test/data/openamp_echo_test.tcl | 8 ++++---- .../data/openamp_matrix_multiply.tcl | 6 +++--- .../openamp_rpc_demo/data/openamp_rpc_demo.tcl | 8 ++++---- lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl | 14 +++++++------- lib/sw_apps/zynqmp_pmufw/data/zynqmp_pmufw.tcl | 14 +++++++------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/sw_apps/freertos_hello_world/data/freertos_hello_world.tcl b/lib/sw_apps/freertos_hello_world/data/freertos_hello_world.tcl index 8afc4d85..58e03afd 100644 --- a/lib/sw_apps/freertos_hello_world/data/freertos_hello_world.tcl +++ b/lib/sw_apps/freertos_hello_world/data/freertos_hello_world.tcl @@ -39,7 +39,7 @@ proc swapp_get_description {} { } proc check_freertos_os {} { - set oslist [get_os]; + set oslist [hsi::get_os]; if { [llength $oslist] != 1 } { return 0; @@ -61,10 +61,10 @@ proc swapp_is_supported_sw {} { proc swapp_is_supported_hw {} { # check processor type - set proc_instance [get_sw_processor]; + set proc_instance [::hsi::get_sw_processor]; set hw_processor [common::get_property HW_INSTANCE $proc_instance] - set proc_type [common::get_property IP_NAME [get_cells $hw_processor]]; + set proc_type [common::get_property IP_NAME [hsi::get_cells $hw_processor]]; if { $proc_type != "psu_cortexr5" } { error "This application is supported only for CortexR5 processors."; diff --git a/lib/sw_apps/openamp_echo_test/data/openamp_echo_test.tcl b/lib/sw_apps/openamp_echo_test/data/openamp_echo_test.tcl index ddbf7573..eb09cde5 100644 --- a/lib/sw_apps/openamp_echo_test/data/openamp_echo_test.tcl +++ b/lib/sw_apps/openamp_echo_test/data/openamp_echo_test.tcl @@ -39,7 +39,7 @@ proc swapp_get_description {} { } proc check_standalone_os {} { - set oslist [get_os]; + set oslist [hsi::get_os]; if { [llength $oslist] != 1 } { return 0; @@ -56,7 +56,7 @@ proc swapp_is_supported_sw {} { #check_standalone_os; # make sure xilffs is available - set librarylist [get_libs -filter "NAME==xilopenamp"]; + set librarylist [hsi::get_libs -filter "NAME==xilopenamp"]; if { [llength $librarylist] == 0 } { error "This application requires xilopenamp library in the Board Support Package."; @@ -68,10 +68,10 @@ proc swapp_is_supported_sw {} { proc swapp_is_supported_hw {} { # check processor type - set proc_instance [get_sw_processor]; + set proc_instance [hsi::get_sw_processor]; set hw_processor [common::get_property HW_INSTANCE $proc_instance] - set proc_type [common::get_property IP_NAME [get_cells $hw_processor]]; + set proc_type [common::get_property IP_NAME [hsi::get_cells $hw_processor]]; if { $proc_type != "psu_cortexr5" } { error "This application is supported only for CortexR5 processors."; diff --git a/lib/sw_apps/openamp_matrix_multiply/data/openamp_matrix_multiply.tcl b/lib/sw_apps/openamp_matrix_multiply/data/openamp_matrix_multiply.tcl index 0bd65c8b..dac45a9a 100644 --- a/lib/sw_apps/openamp_matrix_multiply/data/openamp_matrix_multiply.tcl +++ b/lib/sw_apps/openamp_matrix_multiply/data/openamp_matrix_multiply.tcl @@ -56,7 +56,7 @@ proc swapp_is_supported_sw {} { #check_standalone_os; # make sure xilffs is available - set librarylist [get_libs -filter "NAME==xilopenamp"]; + set librarylist [hsi::get_libs -filter "NAME==xilopenamp"]; if { [llength $librarylist] == 0 } { error "This application requires xilopenamp library in the Board Support Package."; @@ -68,10 +68,10 @@ proc swapp_is_supported_sw {} { proc swapp_is_supported_hw {} { # check processor type - set proc_instance [get_sw_processor]; + set proc_instance [hsi::get_sw_processor]; set hw_processor [common::get_property HW_INSTANCE $proc_instance] - set proc_type [common::get_property IP_NAME [get_cells $hw_processor]]; + set proc_type [common::get_property IP_NAME [hsi::get_cells $hw_processor]]; if { $proc_type != "psu_cortexr5" } { error "This application is supported only for CortexR5 processors."; diff --git a/lib/sw_apps/openamp_rpc_demo/data/openamp_rpc_demo.tcl b/lib/sw_apps/openamp_rpc_demo/data/openamp_rpc_demo.tcl index a6f88acb..a946f10a 100644 --- a/lib/sw_apps/openamp_rpc_demo/data/openamp_rpc_demo.tcl +++ b/lib/sw_apps/openamp_rpc_demo/data/openamp_rpc_demo.tcl @@ -39,7 +39,7 @@ proc swapp_get_description {} { } proc check_standalone_os {} { - set oslist [get_os]; + set oslist [hsi::get_os]; if { [llength $oslist] != 1 } { return 0; @@ -56,7 +56,7 @@ proc swapp_is_supported_sw {} { #check_standalone_os; # make sure xilffs is available - set librarylist [get_libs -filter "NAME==xilopenamp"]; + set librarylist [hsi::get_libs -filter "NAME==xilopenamp"]; if { [llength $librarylist] == 0 } { error "This application requires xilopenamp library in the Board Support Package."; @@ -68,10 +68,10 @@ proc swapp_is_supported_sw {} { proc swapp_is_supported_hw {} { # check processor type - set proc_instance [get_sw_processor]; + set proc_instance [hsi::get_sw_processor]; set hw_processor [common::get_property HW_INSTANCE $proc_instance] - set proc_type [common::get_property IP_NAME [get_cells $hw_processor]]; + set proc_type [common::get_property IP_NAME [hsi::get_cells $hw_processor]]; if { $proc_type != "psu_cortexr5" } { error "This application is supported only for CortexR5 processors."; diff --git a/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl b/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl index 09dbc3c0..890283a2 100755 --- a/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl +++ b/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl @@ -59,8 +59,8 @@ proc swapp_is_supported_sw {} { check_standalone_os; # make sure xilffs and xilrsa are available - set librarylist_1 [get_libs -filter "NAME==xilffs"]; - set librarylist_2 [get_libs -filter "NAME==xilsecure"]; + set librarylist_1 [hsi::get_libs -filter "NAME==xilffs"]; + set librarylist_2 [hsi::get_libs -filter "NAME==xilsecure"]; if { [llength $librarylist_1] == 0 && [llength $librarylist_2] == 0 } { error "This application requires xilffs and xilsecure libraries in the Board Support Package."; @@ -74,10 +74,10 @@ proc swapp_is_supported_sw {} { proc swapp_is_supported_hw {} { # check processor type - set proc_instance [get_sw_processor]; + set proc_instance [hsi::get_sw_processor]; set hw_processor [common::get_property HW_INSTANCE $proc_instance] - set proc_type [common::get_property IP_NAME [get_cells $hw_processor]]; + set proc_type [common::get_property IP_NAME [hsi::get_cells $hw_processor]]; if { $proc_type != "psu_cortexr5" && $proc_type != "psu_cortexa53" } { error "This application is supported only for CortexA53/CortexR5 processors."; @@ -94,7 +94,7 @@ proc get_stdout {} { } proc check_stdout_hw {} { - set pu_uarts [get_cells -filter "IP_NAME=psu_uart"]; + set pu_uarts [hsi::get_cells -filter "IP_NAME=psu_uart"]; } proc swapp_generate {} { @@ -115,9 +115,9 @@ proc swapp_generate {} { file delete -force $init_file } - set proc_instance [get_sw_processor]; + set proc_instance [hsi::get_sw_processor]; set hw_processor [common::get_property HW_INSTANCE $proc_instance] - set proc_type [common::get_property IP_NAME [get_cells $hw_processor]]; + set proc_type [common::get_property IP_NAME [hsi::get_cells $hw_processor]]; # based on the CPU (A53 or R5), # remove unnecesary linker script and retain just one: lscript.ld diff --git a/lib/sw_apps/zynqmp_pmufw/data/zynqmp_pmufw.tcl b/lib/sw_apps/zynqmp_pmufw/data/zynqmp_pmufw.tcl index b6ea5e6c..3f579ea3 100644 --- a/lib/sw_apps/zynqmp_pmufw/data/zynqmp_pmufw.tcl +++ b/lib/sw_apps/zynqmp_pmufw/data/zynqmp_pmufw.tcl @@ -39,7 +39,7 @@ proc swapp_get_description {} { } proc check_standalone_os {} { - set oslist [get_os]; + set oslist [hsi::get_os]; if { [llength $oslist] != 1 } { return 0; @@ -57,9 +57,9 @@ proc swapp_is_supported_sw {} { proc swapp_is_supported_hw {} { # check processor type - set proc_instance [get_sw_processor]; - set hw_processor [get_property HW_INSTANCE $proc_instance] - set proc_type [get_property IP_NAME [get_cells $hw_processor]]; + set proc_instance [hsi::get_sw_processor]; + set hw_processor [common::get_property HW_INSTANCE $proc_instance] + set proc_type [common::get_property IP_NAME [hsi::get_cells $hw_processor]]; if {($proc_type != "psu_microblaze")} { error "This application is supported only for PMU Microblaze processor (psu_microblaze)."; @@ -69,14 +69,14 @@ proc swapp_is_supported_hw {} { } proc get_stdout {} { - set os [get_os]; - set stdout [get_property CONFIG.STDOUT $os]; + set os [hsi::get_os]; + set stdout [common::get_property CONFIG.STDOUT $os]; return $stdout; } proc swapp_generate {} { # PMU Firmware uses its own startup file. so set the -nostartfiles flag - set_property -name APP_LINKER_FLAGS -value {-nostartfiles} -objects [current_sw_design] + set_property -name APP_LINKER_FLAGS -value {-nostartfiles} -objects [hsi::current_sw_design] # Set PMU Microblaze HW related compiler flags set_property -name APP_COMPILER_FLAGS -value {-mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mcpu=v9.2 -mxl-soft-mul} -objects [current_sw_design] }