From ef064c430de4eb043b1485ad46c8ea4d35901018 Mon Sep 17 00:00:00 2001 From: Kedareswara rao Appana Date: Thu, 13 Nov 2014 11:56:31 +0530 Subject: [PATCH] bsp: Fix bug in the xilernel bsp tcl This patch fixes the xilkernel_thread_demo app compilation error when microblaze is configured with mmu(C_USE_MMU) greater than one. Signed-off-by: Kedareswara rao Appana --- lib/bsp/xilkernel/data/xilkernel.tcl | 16 ++++++++++++---- lib/bsp/xilkernel/src/ChangeLog | 4 ++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/bsp/xilkernel/data/xilkernel.tcl b/lib/bsp/xilkernel/data/xilkernel.tcl index d7d3d647..323e820c 100755 --- a/lib/bsp/xilkernel/data/xilkernel.tcl +++ b/lib/bsp/xilkernel/data/xilkernel.tcl @@ -553,10 +553,18 @@ proc generate {os_handle} { set addrlists [get_mem_ranges -of_objects [get_cells $sw_proc_handle]] set addrlist [list] foreach addrist $addrlists { - set mem [xget_ip_mem_ranges $addrist] - set mc_base [get_property BASE_VALUE $mem] - set mc_high [get_property HIGH_VALUE $mem] - lappend addrlist $mc_base $mc_high + set ip_name [get_property IP_NAME [get_cells $addrist]] + if { $ip_name == "axi_emc" || $ip_name == "mig_7series" } { + set mem [lindex [get_mem_ranges $addrist] 0] + set mc_base [get_property BASE_VALUE $mem] + set mc_high [get_property HIGH_VALUE $mem] + lappend addrlist $mc_base $mc_high + } else { + set mem [hsm::utils::get_ip_mem_ranges $addrist] + set mc_base [get_property BASE_VALUE $mem] + set mc_high [get_property HIGH_VALUE $mem] + lappend addrlist $mc_base $mc_high + } } if { $dcachelink_handle != "" } { diff --git a/lib/bsp/xilkernel/src/ChangeLog b/lib/bsp/xilkernel/src/ChangeLog index 0d811286..20b357c8 100755 --- a/lib/bsp/xilkernel/src/ChangeLog +++ b/lib/bsp/xilkernel/src/ChangeLog @@ -174,3 +174,7 @@ Change Log for Xilkernel 2014-06-27 * Fixed the CR:802962 and the CR:803104 changes are made in the tcl file + +2014-11-13 + * Fixed CR:828759 Changes are made in the tcl file +