From 2374e5de1c7f01e0477fdc09d2070a313959f4a1 Mon Sep 17 00:00:00 2001 From: Sarat Chand Savitala Date: Wed, 13 May 2015 10:54:45 +0530 Subject: [PATCH] sw_apps:zynqmp_fsbl: xilsecure library selection by default While creating new FSBL+BSP project, made xilsecure library to be selected by default. This avoids compilation errors when FSBL project is created. Signed-off-by: Sarat Chand Savitala --- lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.mss | 6 +++++- lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.mss b/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.mss index 96fde6c7..d0074feb 100755 --- a/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.mss +++ b/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.mss @@ -41,4 +41,8 @@ END BEGIN LIBRARY PARAMETER LIBRARY_NAME = xilffs -END \ No newline at end of file +END + +BEGIN LIBRARY + PARAMETER LIBRARY_NAME = xilsecure +END diff --git a/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl b/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl index 47b13294..e9afe411 100755 --- a/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl +++ b/lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl @@ -58,13 +58,16 @@ 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 are available + set librarylist_1 [get_libs -filter "NAME==xilffs"]; + set librarylist_2 [get_libs -filter "NAME==xilsecure"]; - if { [llength $librarylist] == 0 } { + if { [llength $librarylist_1] == 0 && [llength $librarylist_2] == 0 } { + error "This application requires xilffs and xilsecure 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." + } elseif { [llength $librarylist_2] == 0 } { + error "This application requires xilsecure library in the Board Support Package."; } }