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:30 UTC

[nuttx] 01/03: stm32f7-meadow: Fix QUADSPI call function

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)