From 456ed53663bccf1a63c38f0e9a898f3a451af533 Mon Sep 17 00:00:00 2001 From: P L Sai Krishna Date: Tue, 23 Jun 2015 18:54:02 +0530 Subject: [PATCH] xilisf: Removed compilation errors on DC1. This patch removes compilation errors by enabling the IntelStmFlashInitialize function for STM flash family on DC1. Signed-off-by: P L Sai Krishna --- lib/sw_services/xilisf/src/include/xilisf.h | 7 ++----- lib/sw_services/xilisf/src/xilisf.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/sw_services/xilisf/src/include/xilisf.h b/lib/sw_services/xilisf/src/include/xilisf.h index 4d84ff33..444dd24b 100644 --- a/lib/sw_services/xilisf/src/include/xilisf.h +++ b/lib/sw_services/xilisf/src/include/xilisf.h @@ -985,11 +985,8 @@ int XIsf_Read(XIsf *InstancePtr, XIsf_ReadOperation Operation, */ int XIsf_Erase(XIsf *InstancePtr, XIsf_EraseOperation Operation, u32 Address); -#if (((XPAR_XISF_FLASH_FAMILY == INTEL) || (XPAR_XISF_FLASH_FAMILY == STM) \ - || (XPAR_XISF_FLASH_FAMILY == SST) || \ - (XPAR_XISF_FLASH_FAMILY == WINBOND) || \ - (XPAR_XISF_FLASH_FAMILY == SPANSION)) && \ - (!defined(XPAR_XISF_INTERFACE_PSQSPI))) +#if ((XPAR_XISF_FLASH_FAMILY == SPANSION) && \ + defined(XPAR_XISF_INTERFACE_AXISPI)) /* * Function for entering into 4 byte mode for Micron flash. */ diff --git a/lib/sw_services/xilisf/src/xilisf.c b/lib/sw_services/xilisf/src/xilisf.c index 62ff99c2..1d02c18c 100644 --- a/lib/sw_services/xilisf/src/xilisf.c +++ b/lib/sw_services/xilisf/src/xilisf.c @@ -190,7 +190,9 @@ int SendBankSelect(XIsf *InstancePtr, u32 BankSel); static int AtmelFlashInitialize(XIsf *InstancePtr, u8 *ReadBuf); #endif /* (XPAR_XISF_FLASH_FAMILY == ATMEL) */ -#if (((XPAR_XISF_FLASH_FAMILY == SPANSION)) && \ +#if (((XPAR_XISF_FLASH_FAMILY == INTEL) || (XPAR_XISF_FLASH_FAMILY == STM) || \ + (XPAR_XISF_FLASH_FAMILY == SST) || (XPAR_XISF_FLASH_FAMILY == WINBOND) || \ + (XPAR_XISF_FLASH_FAMILY == SPANSION)) && \ (!defined(XPAR_XISF_INTERFACE_PSQSPI))) static int IntelStmFlashInitialize(XIsf *InstancePtr, u8 *ReadBuf); #endif /* (((XPAR_XISF_FLASH_FAMILY == INTEL) || \ @@ -1328,8 +1330,8 @@ static int AtmelFlashInitialize(XIsf *InstancePtr, u8 *BufferPtr) } #endif /* (XPAR_XISF_FLASH_FAMILY == ATMEL) */ -#if (((XPAR_XISF_FLASH_FAMILY == SPANSION)) && \ - (!defined(XPAR_XISF_INTERFACE_PSQSPI))) +#if ((XPAR_XISF_FLASH_FAMILY == SPANSION) && \ + defined(XPAR_XISF_INTERFACE_AXISPI)) /*****************************************************************************/ /** * @@ -1434,7 +1436,13 @@ int XIsf_MicronFlashExit4BAddMode(XIsf *InstancePtr) InstancePtr->FourByteAddrMode = FALSE; return Status; } +#endif /* ((XPAR_XISF_FLASH_FAMILY == SPANSION) && \ + defined(XPAR_XISF_INTERFACE_AXISPI)) */ +#if (((XPAR_XISF_FLASH_FAMILY == INTEL) || (XPAR_XISF_FLASH_FAMILY == STM) || \ + (XPAR_XISF_FLASH_FAMILY == SST) || (XPAR_XISF_FLASH_FAMILY == WINBOND) || \ + (XPAR_XISF_FLASH_FAMILY == SPANSION)) && \ + (!defined(XPAR_XISF_INTERFACE_PSQSPI))) /*****************************************************************************/ /** *