From 7512b7dfda41d60e8692c9819965d3cd87653006 Mon Sep 17 00:00:00 2001 From: Sarat Chand Savitala Date: Wed, 10 Dec 2014 18:02:17 +0530 Subject: [PATCH] sw_apps:zynq_fsbl: Fix for the library information in the FSBL template In SDK GUI, the information of requirement of libraries for creating Zynq FSBL was showing incorrect messages in Application project window. When both xilffs and xilrsa libraries were absent, the error message in SDK mentions only about xilffs. This is corrected and the error message now reflects the exact essential libraries that are missing. This is fix for CR#837141. Signed-off-by: Sarat Chand Savitala --- lib/sw_apps/zynq_fsbl/data/zynq_fsbl.tcl | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/lib/sw_apps/zynq_fsbl/data/zynq_fsbl.tcl b/lib/sw_apps/zynq_fsbl/data/zynq_fsbl.tcl index 8161c6a1..7c164a08 100755 --- a/lib/sw_apps/zynq_fsbl/data/zynq_fsbl.tcl +++ b/lib/sw_apps/zynq_fsbl/data/zynq_fsbl.tcl @@ -26,22 +26,19 @@ proc swapp_is_supported_sw {} { # make sure we are using standalone OS #check_standalone_os; - # make sure xilffs is available - set librarylist [get_libs -filter "NAME==xilffs"]; + # make sure xilffs and xilrsa libraries are available - if { [llength $librarylist] == 0 } { + set librarylist_1 [get_libs -filter "NAME==xilffs"]; + set librarylist_2 [get_libs -filter "NAME==xilrsa"]; + + if { [llength $librarylist_1] == 0 && [llength $librarylist_2] == 0 } { + error "This application requires xilffs and xilrsa libraries in the Board Support Package."; + } elseif { [llength $librarylist_1] == 0 } { error "This application requires xilffs library in the Board Support Package."; - } elseif { [llength $librarylist] > 1} { - error "Multiple xilffs libraries present in the Board Support Package." - } - # make sure xilrsa is available - set librarylist [get_libs -filter "NAME==xilrsa"]; - - if { [llength $librarylist] == 0 } { + } elseif { [llength $librarylist_2] == 0 } { error "This application requires xilrsa library in the Board Support Package."; - } elseif { [llength $librarylist] > 1} { - error "Multiple xilrsa libraries present in the Board Support Package." } + } proc swapp_is_supported_hw {} {