boards/xtensa/esp32: Fix the SPI Flash MTD block device number

tmedicci · xiaoxiang781216 · commit a0cc89349fb0 · 2025-04-17T13:48:46.000+08:00
This commit fixes the SPI flash MTD block device number if OTA's
partitions are present. In this case, the OTA partitions are
registered first and the corresponding MTD block device drivers
are assigned with the numbers corresponding to those partitions.
Then, the additional SPI flash partition should consider that when
registering its own corresponding MTD block device driver.

Signed-off-by: Tiago Medicci Serrano &lt;tiago.medicci@espressif.com&gt;
diff --git a/boards/xtensa/esp32/common/src/esp32_board_spiflash.c b/boards/xtensa/esp32/common/src/esp32_board_spiflash.c
@@ -429,7 +429,11 @@ static int init_storage_partition(void)
       return ret;
     }
 
+#ifdef CONFIG_ESP32_HAVE_OTA_PARTITION
+  ret = ftl_initialize(nitems(g_ota_partition_table), mtd);
+#else
   ret = ftl_initialize(0, mtd);
+#endif
   if (ret < 0)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize the FTL layer: %d\n",

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,11 @@ static int init_storage_partition(void)`
`429`	`429`	`return ret;`
`430`	`430`	`}`
`431`	`431`
	`432`	`+#ifdef CONFIG_ESP32_HAVE_OTA_PARTITION`
	`433`	`+ ret = ftl_initialize(nitems(g_ota_partition_table), mtd);`
	`434`	`+#else`
`432`	`435`	`ret = ftl_initialize(0, mtd);`
	`436`	`+#endif`
`433`	`437`	`if (ret < 0)`
`434`	`438`	`{`
`435`	`439`	`syslog(LOG_ERR, "ERROR: Failed to initialize the FTL layer: %d\n",`