Merge pull request #5506 from maholli/nvm-toml-fix

NVM toml fix (MRAM)
adafruit · Oct 25, 2021 · 7377375 · 7377375
2 parents 644272e + adbff05
commit 7377375
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ports/atmel-samd/supervisor/qspi_flash.c b/ports/atmel-samd/supervisor/qspi_flash.c
@@ -243,7 +243,7 @@ void spi_flash_init(void) {
 
     // The QSPI is only connected to one set of pins in the SAMD51 so we can hard code it.
     #ifdef EXTERNAL_FLASH_QSPI_SINGLE
-    uint32_t pins[] = {PIN_PA08, PIN_PB10, PIN_PB11};
+    uint32_t pins[] = {PIN_PA08, PIN_PA09, PIN_PA10, PIN_PA11, PIN_PB10, PIN_PB11};
     #elif defined(EXTERNAL_FLASH_QSPI_DUAL)
     uint32_t pins[] = {PIN_PA08, PIN_PA09, PIN_PB10, PIN_PB11};
     #else

diff --git a/supervisor/shared/external_flash/devices.h.jinja b/supervisor/shared/external_flash/devices.h.jinja
@@ -41,6 +41,9 @@
         .supports_qspi_writes = {{ device["32_qspi_write"] | lower() }}, \
         .write_status_register_split = {{ device.write_status_register_split | lower() }}, \
         .single_status_byte = {{ (device.quad_enable_status_byte == 1) | lower() }}, \
+        .no_ready_bit = {{ (device.no_ready_bit == 1) | lower() }}, \
+        .no_erase_cmd = {{ (device.no_erase_cmd == 1) | lower() }}, \
+        .no_reset_cmd = {{ (device.no_reset_cmd == 1) | lower() }}, \
 }
 {% endfor %}