From 479fc78c1ed42e90594376b80a02f276e89397e1 Mon Sep 17 00:00:00 2001
From: Kishore Kumar Korathaluri <kkorath@xilinx.com>
Date: Tue, 23 Dec 2014 11:08:03 +0530
Subject: [PATCH] emc : Modified namespace from HSM to HSI.

Signed-off-by: Kishore Kumar Korathaluri <kkorath@xilinx.com>
---
 XilinxProcessorIPLib/drivers/emc/data/emc.tcl | 22 +++++++++----------
 .../drivers/emc/data/emc_tapp.tcl             |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/XilinxProcessorIPLib/drivers/emc/data/emc.tcl b/XilinxProcessorIPLib/drivers/emc/data/emc.tcl
index 0f0268d7..3588ff02 100755
--- a/XilinxProcessorIPLib/drivers/emc/data/emc.tcl
+++ b/XilinxProcessorIPLib/drivers/emc/data/emc.tcl
@@ -65,12 +65,12 @@ proc generate {drv_handle} {
 proc xdefine_include_file_membank {drv_handle file_name} {
 
     # Get all peripherals connected to this driver
-    set periphs [::hsm::utils::get_common_driver_ips  $drv_handle] 
+    set periphs [::hsi::utils::get_common_driver_ips  $drv_handle]
 
     foreach periph $periphs {
         set addr_params ""
-        set addr_params [::hsm::utils::find_addr_params $periph]
-        ::hsm::utils::define_membank $periph $file_name $addr_params
+        set addr_params [::hsi::utils::find_addr_params $periph]
+        ::hsi::utils::define_membank $periph $file_name $addr_params
     }
 }
 
@@ -80,10 +80,10 @@ proc xdefine_include_file_membank {drv_handle file_name} {
 #
 proc xdefine_canonical_xpars {drv_handle file_name drv_string args} {
     # Open include file
-    set file_handle [::hsm::utils::open_include_file $file_name]
+    set file_handle [::hsi::utils::open_include_file $file_name]
 
     # Get all the peripherals connected to this driver
-    set periphs [::hsm::utils::get_common_driver_ips  $drv_handle]
+    set periphs [::hsi::utils::get_common_driver_ips  $drv_handle]
 
     # Get the names of all the peripherals connected to this driver
     foreach periph $periphs {
@@ -119,30 +119,30 @@ proc xdefine_canonical_xpars {drv_handle file_name drv_string args} {
 
             # Generate canonical definitions for memory banks
             set addr_params ""
-            set addr_params [::hsm::utils::find_addr_params $periph]
+            set addr_params [::hsi::utils::find_addr_params $periph]
             set arguments [concat $args $addr_params]
             foreach arg $arguments {
-                set lvalue [::hsm::utils::get_driver_param_name $canonical_name $arg]
+                set lvalue [::hsi::utils::get_driver_param_name $canonical_name $arg]
 
                 # The commented out rvalue is the name of the instance-specific constant
-                # set rvalue [::hsm::utils::get_ip_param_name $periph $arg]
+                # set rvalue [::hsi::utils::get_ip_param_name $periph $arg]
                 # The rvalue set below is the actual value of the parameter
                 set rvalue [get_property CONFIG.$arg $periph]
                 if {[llength $rvalue] == 0} {
                     set rvalue 0
                 }
-                set rvalue [::hsm::utils::format_addr_string $rvalue $arg]
+                set rvalue [::hsi::utils::format_addr_string $rvalue $arg]
 
                 puts $file_handle "#define $lvalue $rvalue"
             }
 
             if {$i == 0} {
                 puts $file_handle ""
-                set bus_name [::hsm::utils::get_intfnet_name $periph "SPLB"]
+                set bus_name [::hsi::utils::get_intfnet_name $periph "SPLB"]
                 if { [string compare -nocase $bus_name ""] != 0 } {
                     puts $file_handle "#define XPAR_XPS_MCH_EMC"
                 } else {
-                    set bus_name [::hsm::utils::get_intfnet_name $periph "S_AXI_MEM"]
+                    set bus_name [::hsi::utils::get_intfnet_name $periph "S_AXI_MEM"]
                     if { [string compare -nocase $bus_name ""] != 0 } {
                         puts $file_handle "#define XPAR_AXI_EMC"
                     }
diff --git a/XilinxProcessorIPLib/drivers/emc/data/emc_tapp.tcl b/XilinxProcessorIPLib/drivers/emc/data/emc_tapp.tcl
index 7899c95c..a2054bb7 100755
--- a/XilinxProcessorIPLib/drivers/emc/data/emc_tapp.tcl
+++ b/XilinxProcessorIPLib/drivers/emc/data/emc_tapp.tcl
@@ -149,7 +149,7 @@ proc gen_testfunc_call {swproj mhsinst} {
 
   # Get XPAR_ macro for each baseaddr param
   foreach baseaddr $baseaddrs {
-    lappend baseaddr_macros [::hsm::utils::get_ip_param_name $mhsinst $baseaddr]
+    lappend baseaddr_macros [::hsi::utils::get_ip_param_name $mhsinst $baseaddr]
   }
 
   foreach baseaddr $baseaddr_macros {