Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix naming of Spansion device, s25fl1 not st25fl1

Browse Source
This commit is contained in:
Gregory Nutt
2015-11-07 11:30:24 -06:00
parent f2b3b65456
commit 2b8ecb042b
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/samv71-xult/mxtxplnd/defconfig
+1 -1
View File
@@ -590,7 +590,7 @@ CONFIG_AT25_SPIMODE=0
CONFIG_AT25_SPIFREQUENCY=20000000
# CONFIG_MTD_AT45DB is not set
# CONFIG_MTD_M25P is not set
# CONFIG_MTD_ST25FL1 is not set
# CONFIG_MTD_S25FL1 is not set
# CONFIG_MTD_SMART is not set
# CONFIG_MTD_RAMTRON is not set
# CONFIG_MTD_SST25 is not set
configs/samv71-xult/netnsh/defconfig
+1 -1
View File
@@ -562,7 +562,7 @@ CONFIG_AT25_SPIMODE=0
CONFIG_AT25_SPIFREQUENCY=20000000
# CONFIG_MTD_AT45DB is not set
# CONFIG_MTD_M25P is not set
# CONFIG_MTD_ST25FL1 is not set
# CONFIG_MTD_S25FL1 is not set
# CONFIG_MTD_SMART is not set
# CONFIG_MTD_RAMTRON is not set
# CONFIG_MTD_SST25 is not set
configs/samv71-xult/nsh/defconfig
+1 -1
View File
@@ -545,7 +545,7 @@ CONFIG_AT25_SPIMODE=0
CONFIG_AT25_SPIFREQUENCY=20000000
# CONFIG_MTD_AT45DB is not set
# CONFIG_MTD_M25P is not set
# CONFIG_MTD_ST25FL1 is not set
# CONFIG_MTD_S25FL1 is not set
# CONFIG_MTD_SMART is not set
# CONFIG_MTD_RAMTRON is not set
# CONFIG_MTD_SST25 is not set
configs/samv71-xult/nxwm/defconfig
+1 -1
View File
@@ -593,7 +593,7 @@ CONFIG_AT25_SPIMODE=0
CONFIG_AT25_SPIFREQUENCY=20000000
# CONFIG_MTD_AT45DB is not set
# CONFIG_MTD_M25P is not set
# CONFIG_MTD_ST25FL1 is not set
# CONFIG_MTD_S25FL1 is not set
# CONFIG_MTD_SMART is not set
# CONFIG_MTD_RAMTRON is not set
# CONFIG_MTD_SST25 is not set
configs/samv71-xult/src/sam_bringup.c
+7 -7
View File
@@ -55,7 +55,7 @@
#include "samv71-xult.h"
#ifdef HAVE_ST25FL1
#ifdef HAVE_S25FL1
#include <nuttx/spi/qspi.h>
#include <nuttx/mtd/mtd.h>
#include "sam_qspi.h"
@@ -95,7 +95,7 @@
int sam_bringup(void)
{
#ifdef HAVE_ST25FL1
#ifdef HAVE_S25FL1
FAR struct qspi_dev_s *qspi;
FAR struct mtd_dev_s *mtd;
#endif
@@ -188,7 +188,7 @@ int sam_bringup(void)
}
#endif
#ifdef HAVE_ST25FL1
#ifdef HAVE_S25FL1
/* Create an instance of the SAMV71 QSPI device driver */
qspi = sam_qspi_initialize(0);
@@ -199,13 +199,13 @@ int sam_bringup(void)
else
{
/* Use the QSPI device instance to initialize the
* ST25FL1 device.
* S25FL1 device.
*/
mtd = st25fl1_initialize(qspi);
mtd = s25fl1_initialize(qspi);
if (!mtd)
{
SYSLOG("ERROR: st25fl1_initialize failed\n");
SYSLOG("ERROR: s25fl1_initialize failed\n");
}
#ifdef HAVE_SMARTFS
@@ -218,7 +218,7 @@ int sam_bringup(void)
}
#else
/* And now do what with the ST25FL1 MTD device? */
/* And now do what with the S25FL1 MTD device? */
# warning Missing Logic
#endif
configs/samv71-xult/src/samv71-xult.h
+5 -5
View File
@@ -61,7 +61,7 @@
#define HAVE_NETWORK 1
#define HAVE_MACADDR 1
#define HAVE_MTDCONFIG 1
#define HAVE_ST25FL1 1
#define HAVE_S25FL1 1
#define HAVE_SMARTFS 1
#define HAVE_WM8904 1
#define HAVE_AUDIO_NULL 1
@@ -183,15 +183,15 @@
# undef HAVE_MTDCONFIG
#endif
/* ST25FL1 QuadSPI FLASH */
/* S25FL1 QuadSPI FLASH */
#ifndef CONFIG_MTD_ST25FL1
# undef HAVE_ST25FL1
#ifndef CONFIG_MTD_S25FL1
# undef HAVE_S25FL1
# undef HAVE_SMARTFS
#endif
#ifndef CONFIG_SAMV7_QSPI
# undef HAVE_ST25FL1
# undef HAVE_S25FL1
# undef HAVE_SMARTFS
#endif