mirror of
https://github.com/apache/nuttx.git
synced 2026-06-05 15:58:59 +08:00
Correct naming of Spansion part. S25FL1, not ST25FL1
This commit is contained in:
+1
-1
Submodule configs updated: 8e4edaaa02...f475b05030
+11
-11
@@ -395,18 +395,18 @@ config M25P_SUBSECTOR_ERASE
|
||||
|
||||
endif
|
||||
|
||||
config MTD_ST25FL1
|
||||
bool "QuadSPI-based ST25FL1 FLASH"
|
||||
config MTD_S25FL1
|
||||
bool "QuadSPI-based S25FL1 FLASH"
|
||||
default n
|
||||
|
||||
if MTD_ST25FL1
|
||||
if MTD_S25FL1
|
||||
|
||||
config ST25FL1_QSPIMODE
|
||||
int "ST25FL1 QuadSPI Mode"
|
||||
config S25FL1_QSPIMODE
|
||||
int "S25FL1 QuadSPI Mode"
|
||||
default 0
|
||||
|
||||
config ST25FL1_QSPI_FREQUENCY
|
||||
int "ST25FL1 QuadSPI Frequency"
|
||||
config S25FL1_QSPI_FREQUENCY
|
||||
int "S25FL1 QuadSPI Frequency"
|
||||
default 108000000
|
||||
---help---
|
||||
Per data sheet:
|
||||
@@ -430,20 +430,20 @@ config ST25FL1_QSPI_FREQUENCY
|
||||
|
||||
In this implementation, only "Quad" reads are performed.
|
||||
|
||||
config ST25FL1_SECTOR512
|
||||
config S25FL1_SECTOR512
|
||||
bool "Simulate 512 byte Erase Blocks"
|
||||
default n
|
||||
|
||||
config ST25FL1_SCRAMBLE
|
||||
config S25FL1_SCRAMBLE
|
||||
bool "Scramble data"
|
||||
default n
|
||||
---help---
|
||||
Requires drviver support for data scrambling/descrambling.
|
||||
|
||||
config ST25FL1_SCRAMBLE_KEY
|
||||
config S25FL1_SCRAMBLE_KEY
|
||||
hex "Scramble key"
|
||||
default 0x0baddead
|
||||
depends on ST25FL1_SCRAMBLE
|
||||
depends on S25FL1_SCRAMBLE
|
||||
|
||||
endif
|
||||
|
||||
|
||||
@@ -92,8 +92,8 @@ ifeq ($(CONFIG_MTD_AT25),y)
|
||||
CSRCS += at25.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_MTD_ST25FL1),y)
|
||||
CSRCS += st25fl1.c
|
||||
ifeq ($(CONFIG_MTD_S25FL1),y)
|
||||
CSRCS += s25fl1.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_MTD_SMART),y)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -475,7 +475,7 @@ FAR struct mtd_dev_s *sst39vf_initialize(void);
|
||||
FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *dev);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: st25fl1_initialize
|
||||
* Name: s25fl1_initialize
|
||||
*
|
||||
* Description:
|
||||
* Create an initialize MTD device instance for the QuadSPI-based ST24FL1
|
||||
@@ -484,7 +484,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *dev);
|
||||
****************************************************************************/
|
||||
|
||||
struct qspi_dev_s; /* Forward reference */
|
||||
FAR struct mtd_dev_s *st25fl1_initialize(FAR struct qspi_dev_s *qspi);
|
||||
FAR struct mtd_dev_s *s25fl1_initialize(FAR struct qspi_dev_s *qspi);
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_flashinitialize
|
||||
|
||||
Reference in New Issue
Block a user