Merge "fix(include/drivers/flexspi): fix warm boot wait time for MT35XU512A" into integration
This commit is contained in:
commit
e093b3fc8b
|
@ -12,6 +12,7 @@
|
|||
|
||||
#define SZ_16M_BYTES 0x1000000U
|
||||
|
||||
/* Start of "if defined(CONFIG_MT25QU512A)" */
|
||||
#if defined(CONFIG_MT25QU512A)
|
||||
#define F_SECTOR_64K 0x10000U
|
||||
#define F_PAGE_256 0x100U
|
||||
|
@ -22,6 +23,9 @@
|
|||
#define F_SECTOR_ERASE_SZ F_SECTOR_4K
|
||||
#endif
|
||||
|
||||
/* End of "if defined(CONFIG_MT25QU512A)" */
|
||||
|
||||
/* Start of "if defined(CONFIG_MX25U25645G)" */
|
||||
#elif defined(CONFIG_MX25U25645G)
|
||||
#define F_SECTOR_64K 0x10000U
|
||||
#define F_PAGE_256 0x100U
|
||||
|
@ -32,6 +36,9 @@
|
|||
#define F_SECTOR_ERASE_SZ F_SECTOR_4K
|
||||
#endif
|
||||
|
||||
/* End of "if defined(CONFIG_MX25U25645G)" */
|
||||
|
||||
/* Start of "if defined(CONFIG_MX25U51245G)" */
|
||||
#elif defined(CONFIG_MX25U51245G)
|
||||
#define F_SECTOR_64K 0x10000U
|
||||
#define F_PAGE_256 0x100U
|
||||
|
@ -42,6 +49,9 @@
|
|||
#define F_SECTOR_ERASE_SZ F_SECTOR_4K
|
||||
#endif
|
||||
|
||||
/* End of "if defined(CONFIG_MX25U51245G)" */
|
||||
|
||||
/* Start of "if defined(CONFIG_MT35XU512A)" */
|
||||
#elif defined(CONFIG_MT35XU512A)
|
||||
#define F_SECTOR_128K 0x20000U
|
||||
#define F_SECTOR_32K 0x8000U
|
||||
|
@ -52,7 +62,18 @@
|
|||
#ifdef CONFIG_FSPI_4K_ERASE
|
||||
#define F_SECTOR_ERASE_SZ F_SECTOR_4K
|
||||
#endif
|
||||
/* If Warm boot is enabled for the platform,
|
||||
* count of arm instruction N-OP(s) to mark
|
||||
* the completion of write operation to flash;
|
||||
* varies from one flash to other.
|
||||
*/
|
||||
#ifdef NXP_WARM_BOOT
|
||||
#define FLASH_WR_COMP_WAIT_BY_NOP_COUNT 0x20000
|
||||
#endif
|
||||
|
||||
/* End of "if defined(CONFIG_MT35XU512A)" */
|
||||
|
||||
/* Start of #elif defined(CONFIG_MT35XU02G) */
|
||||
#elif defined(CONFIG_MT35XU02G)
|
||||
#define F_SECTOR_128K 0x20000U
|
||||
#define F_PAGE_256 0x100U
|
||||
|
@ -63,9 +84,6 @@
|
|||
#define F_SECTOR_ERASE_SZ F_SECTOR_4K
|
||||
#endif
|
||||
|
||||
#ifdef NXP_WARM_BOOT
|
||||
#define FLASH_WR_COMP_WAIT_BY_NOP_COUNT 0x20000
|
||||
#endif
|
||||
#endif /* End of #elif defined(CONFIG_MT35XU02G) */
|
||||
|
||||
#endif
|
||||
#endif /* FLASH_INFO_H */
|
||||
|
|
Loading…
Reference in New Issue