You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/08/09 03:06:29 UTC
[nuttx] branch master updated (3ccc5f0f76 -> 9914999715)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 3ccc5f0f76 libm/newlib: fix newlib build error
new 1a57847e04 stm32f7-meadow: Fix QUADSPI call function
new 5417e193d6 stm32f7-meadow: Update usbnsh defconfig to include QSPI Flash
new 9914999715 stm32_qspi: Fix printf() format warnings
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/stm32f7/stm32_qspi.c | 6 +++---
.../stm32f777zit6-meadow/configs/usbnsh/defconfig | 10 +++++++++
.../stm32f7/stm32f777zit6-meadow/src/stm32_boot.c | 25 ++++++++++++----------
3 files changed, 27 insertions(+), 14 deletions(-)
[nuttx] 02/03: stm32f7-meadow: Update usbnsh defconfig to include QSPI Flash
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5417e193d601709cc66a9a8ae4b0def5ecd56a85
Author: Alan Carvalho de Assis <ac...@gmail.com>
AuthorDate: Mon Aug 7 15:56:32 2023 -0300
stm32f7-meadow: Update usbnsh defconfig to include QSPI Flash
---
.../arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig
index 092ab7c732..8e24de12da 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/configs/usbnsh/defconfig
@@ -32,11 +32,17 @@ CONFIG_CRYPTO=y
CONFIG_CRYPTO_RANDOM_POOL=y
CONFIG_DEV_URANDOM=y
CONFIG_DEV_URANDOM_RANDOM_POOL=y
+CONFIG_FS_LITTLEFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_MM_REGIONS=3
+CONFIG_MTD=y
+CONFIG_MTD_BYTE_WRITE=y
+CONFIG_MTD_PARTITION=y
+CONFIG_MTD_SECT512=y
+CONFIG_MTD_W25QXXXJV=y
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
@@ -48,9 +54,13 @@ CONFIG_RAM_START=0x20010000
CONFIG_RAW_BINARY=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y
+CONFIG_SPI=y
CONFIG_START_DAY=14
CONFIG_STM32F7_OTGFS=y
+CONFIG_STM32F7_QUADSPI=y
CONFIG_STM32F7_USART1=y
+CONFIG_SYSTEM_FLASH_ERASEALL=y
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=64
CONFIG_USBDEV=y
+CONFIG_W25QXXXJV_QSPI_FREQUENCY=64000000
[nuttx] 01/03: stm32f7-meadow: Fix QUADSPI call function
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 1a57847e04bfce0ca938d9387554660ce2ecea19
Author: Alan Carvalho de Assis <ac...@gmail.com>
AuthorDate: Mon Aug 7 15:55:12 2023 -0300
stm32f7-meadow: Fix QUADSPI call function
New board uses a different flash model
---
.../stm32f7/stm32f777zit6-meadow/src/stm32_boot.c | 25 ++++++++++++----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
index 9561be7401..b94e2df956 100644
--- a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
+++ b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c
@@ -141,10 +141,10 @@ void board_late_initialize(void)
return;
}
- mtd = s25fl5_initialize(qspi, true);
+ mtd = w25qxxxjv_initialize(qspi, true);
if (!mtd)
{
- syslog(LOG_ERR, "ERROR: s25fl5_initialize failed\n");
+ syslog(LOG_ERR, "ERROR: w25qxxxjv_initialize failed\n");
}
ret = ftl_initialize(0, mtd);
@@ -153,17 +153,20 @@ void board_late_initialize(void)
ferr("ERROR: Initialize the FTL layer\n");
}
- meminfo.flags = QSPIMEM_READ | QSPIMEM_QUADIO;
- meminfo.addrlen = 3;
- meminfo.dummies = 6;
- meminfo.cmd = 0xeb; /* S25FL1_FAST_READ_QUADIO; */
- meminfo.addr = 0;
- meminfo.buflen = 0;
- meminfo.buffer = NULL;
+ meminfo.flags = QSPIMEM_READ | QSPIMEM_QUADIO;
+ meminfo.addrlen = 3;
+ meminfo.dummies = 6;
+ meminfo.cmd = 0xeb; /* S25FL1_FAST_READ_QUADIO; */
+ meminfo.addr = 0;
+ meminfo.buflen = 0;
+ meminfo.buffer = NULL;
- stm32f7_qspi_enter_memorymapped(qspi, &meminfo, 80000000);
+ stm32f7_qspi_enter_memorymapped(qspi, &meminfo, 80000000);
- stm32_mpu_uheap((uintptr_t)0x90000000, 0x4000000);
+ /* FIXME: stm32_mpu_uheap depends on PROTECTED && MPU
+ *
+ * stm32_mpu_uheap((uintptr_t)0x90000000, 0x4000000);
+ */
#endif
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
[nuttx] 03/03: stm32_qspi: Fix printf() format warnings
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 9914999715462c9a83eb673ba2c4b710061eadfc
Author: Alan Carvalho de Assis <ac...@gmail.com>
AuthorDate: Tue Aug 8 20:29:02 2023 -0300
stm32_qspi: Fix printf() format warnings
---
arch/arm/src/stm32f7/stm32_qspi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/stm32f7/stm32_qspi.c b/arch/arm/src/stm32f7/stm32_qspi.c
index 9dfdaaf68e..ffe5bbd01e 100644
--- a/arch/arm/src/stm32f7/stm32_qspi.c
+++ b/arch/arm/src/stm32f7/stm32_qspi.c
@@ -1797,7 +1797,7 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency)
return 0;
}
- spiinfo("frequency=%ld\n", frequency);
+ spiinfo("frequency=%" PRId32 "\n", frequency);
DEBUGASSERT(priv);
/* Wait till BUSY flag reset */
@@ -1851,14 +1851,14 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency)
/* Calculate the new actual frequency */
actual = STL32F7_QSPI_CLOCK / prescaler;
- spiinfo("prescaler=%ld actual=%ld\n", prescaler, actual);
+ spiinfo("prescaler=%" PRId32 " actual=%" PRId32 "\n", prescaler, actual);
/* Save the frequency setting */
priv->frequency = frequency;
priv->actual = actual;
- spiinfo("Frequency %ld->%ld\n", frequency, actual);
+ spiinfo("Frequency %" PRId32 "->%" PRId32 "\n", frequency, actual);
return actual;
}