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

xilisf: Removed compilation errors on DC1.

Browse source 
This patch removes compilation errors by enabling the
IntelStmFlashInitialize function for STM flash family
on DC1.

Signed-off-by: P L Sai Krishna <lakshmis@xilinx.com>
This commit is contained in:
P L Sai Krishna 2015-06-23 18:54:02 +05:30 • committed by Nava kishore Manne
parent af8728de98
commit 456ed53663
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/sw_services/xilisf/src/include/xilisf.h
View file

@ -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.
*/

14
lib/sw_services/xilisf/src/xilisf.c
View file

@ -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)))
/*****************************************************************************/
/**
*