stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

sw_apps:zynqmp_fsbl: Fix to include compiler flags in FSBL tcl

Browse source 
This fix enables the compiler flags specified in HSI command line
to be appended to those specified in FSBL tcl file.

Signed-off-by: Sarat Chand Savitala <saratcha@xilinx.com>
Acked-by: Krishna Chaitanya Patakamuri <kpataka@xilinx.com>
This commit is contained in:
Sarat Chand Savitala 2015-08-08 15:44:22 +05:30 • committed by Nava kishore Manne
parent 272bff49fb
commit f5f3b0a518
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/sw_apps/zynqmp_fsbl/data/zynqmp_fsbl.tcl
View file

@ -119,6 +119,9 @@ proc swapp_generate {} {
set hw_processor [common::get_property HW_INSTANCE $proc_instance]
set proc_type [common::get_property IP_NAME [hsi::get_cells -hier $hw_processor]];
# get the compiler flags, if set already
set def_flags [get_property APP_COMPILER_FLAGS [current_sw_design]]
# based on the CPU (A53 64-bit, A53 32-bit or R5),
# remove unnecesary linker script and retain just one: lscript.ld
# set the compiler flags
@ -126,9 +129,7 @@ proc swapp_generate {} {
set ld_file_a53 "lscript_a53.ld"
file delete -force $ld_file_a53
set_property -name {APP_COMPILER_FLAGS} \
-value {-Wall -fmessage-length=0 -mcpu=cortex-r5 -mfloat-abi=softfp} \
-objects [current_sw_design ]
set new_flags "-Wall -fmessage-length=0 -mcpu=cortex-r5 -mfloat-abi=softfp $def_flags"
} else {
set compiler [get_property CONFIG.compiler $proc_instance]
@ -137,9 +138,7 @@ proc swapp_generate {} {
set ld_file_a53 "lscript_a53.ld"
file delete -force $ld_file_a53
set_property -name {APP_COMPILER_FLAGS} \
-value {-Wall -fmessage-length=0 -march=armv7-a} \
-objects [current_sw_design ]
set new_flags "-Wall -fmessage-length=0 -march=armv7-a $def_flags"
} else {
#A53 64-bit
set ld_file "lscript.ld"
@ -149,11 +148,11 @@ proc swapp_generate {} {
set ld_file_new "lscript.ld"
file rename -force $ld_file_a53 $ld_file_new
set_property -name {APP_COMPILER_FLAGS} \
-value {-Wall -fmessage-length=0 -DXFSBL_A53} \
-objects [current_sw_design ]
set new_flags "-Wall -fmessage-length=0 -DXFSBL_A53 $def_flags"
}
}
# Update compiler flags
set_property -name {APP_COMPILER_FLAGS} -value $new_flags -objects [current_sw_design]
}
proc swapp_get_linker_constraints {} {