From 272bff49fb3adc327959bb33f2d074600beb0272 Mon Sep 17 00:00:00 2001 From: Sarat Chand Savitala Date: Sat, 8 Aug 2015 15:44:21 +0530 Subject: [PATCH] sw_apps:zynqmp_fsbl: Code changes done to avoid warnings Warnings generated during compiling FSBL sources are addressed. Signed-off-by: Sarat Chand Savitala Acked-by: Krishna Chaitanya Patakamuri --- lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.h | 2 ++ lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c | 6 ++++++ lib/sw_apps/zynqmp_fsbl/src/xfsbl_misc.c | 1 - lib/sw_apps/zynqmp_fsbl/src/xfsbl_partition_load.c | 11 ++++++----- lib/sw_apps/zynqmp_fsbl/src/xfsbl_qspi.c | 7 ++++++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.h b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.h index 39f3d799..d5486b8c 100644 --- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.h +++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_hooks.h @@ -76,6 +76,8 @@ u32 XFsbl_HookAfterBSDownload(void ); u32 XFsbl_HookBeforeHandoff(u32 EarlyHandoff); +u32 XFsbl_HookBeforeFallback(void); + #ifdef __cplusplus } diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c index f0f920a7..d5b6ee27 100644 --- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c +++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c @@ -74,6 +74,12 @@ static u32 XFsbl_PrimaryBootDeviceInit(XFsblPs * FsblInstancePtr); static u32 XFsbl_ValidateHeader(XFsblPs * FsblInstancePtr); static u32 XFsbl_SecondaryBootDeviceInit(XFsblPs * FsblInstancePtr); +/* Functions from xfsbl_misc.c */ +int psu_init(); + +/* Functions from uart.c of BSP */ +void Init_Uart(void); + /** * Functions from xfsbl_misc.c */ diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_misc.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_misc.c index 05645295..ddc89eb0 100644 --- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_misc.c +++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_misc.c @@ -76,7 +76,6 @@ __inline void XFsbl_Printf(u32 DebugType,char *Format, ...) } #endif /************************** Function Prototypes ******************************/ -static char * XFsbl_Itoa(u32 Val, u32 Base); static void XFsbl_UndefHandler (void); #ifndef XFSBL_A53 static void XFsbl_SvcHandler (void); diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_partition_load.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_partition_load.c index d631ffde..79c5a869 100644 --- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_partition_load.c +++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_partition_load.c @@ -83,7 +83,8 @@ static u32 XFsbl_CheckHandoffCpu (XFsblPs * FsblInstancePtr, static u32 XFsbl_ConfigureMemory(u32 RunningCpu, u32 DestinationCpu, u64 Address, u32 Length); void XFsbl_EccInitialize(u32 Address, u32 Length); -u32 XFsbl_GetLoadAddress(u32 DestinationCpu, u64 * LoadAddressPtr, u32 Length); +u32 XFsbl_GetLoadAddress(u32 DestinationCpu, PTRSIZE * LoadAddressPtr, + u32 Length); static void XFsbl_CheckPmuFw(XFsblPs * FsblInstancePtr, u32 PartitionNum); /************************** Variable Definitions *****************************/ @@ -513,10 +514,10 @@ void XFsbl_EccInitialize(u32 Address, u32 Length) } -u32 XFsbl_GetLoadAddress(u32 DestinationCpu, u64 * LoadAddressPtr, u32 Length) +u32 XFsbl_GetLoadAddress(u32 DestinationCpu, PTRSIZE * LoadAddressPtr, u32 Length) { u32 Status = XFSBL_SUCCESS; - u64 Address=0U; + PTRSIZE Address=0U; Address = *LoadAddressPtr; @@ -744,7 +745,7 @@ static u32 XFsbl_PartitionCopy(XFsblPs * FsblInstancePtr, u32 PartitionNum) u32 ExecState=0U; XFsblPs_PartitionHeader * PartitionHeader; u32 SrcAddress=0U; - u64 LoadAddress=0U; + PTRSIZE LoadAddress=0U; u32 Length=0U; u32 RunningCpu=0U; @@ -969,7 +970,7 @@ static u32 XFsbl_PartitionValidation(XFsblPs * FsblInstancePtr, u32 Length=0U; #endif #if defined(XFSBL_RSA) || defined(XFSBL_AES) || defined(XFSBL_BS) - u64 LoadAddress=0U; + PTRSIZE LoadAddress=0U; #endif #if defined(XFSBL_BS) u32 BitstreamWordSize = 0; diff --git a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_qspi.c b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_qspi.c index b8ed6bd8..e9ae8dd7 100644 --- a/lib/sw_apps/zynqmp_fsbl/src/xfsbl_qspi.c +++ b/lib/sw_apps/zynqmp_fsbl/src/xfsbl_qspi.c @@ -346,7 +346,12 @@ static u32 XFsbl_GetQspiAddr(u32 Address ) break; default: - /* RealAddr wont be assigned in this case; */ + /* + * We should never reach here as error will be triggered during + * QSPI Init for invalid connection mode. Hence, assign a value (0) + * to RealAddr, to avoid warning. + */ + RealAddr = 0U; break; }