From 835504d30a4d001985e180ae02c6dd2acaa041f9 Mon Sep 17 00:00:00 2001
From: Matthew Macovsky <maxm@cypress.com>
Date: Fri, 30 Aug 2019 20:47:40 +0100
Subject: [PATCH] Update QSPI format after enabling 4-byte addressing

---
 .../blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
index 221669856f..d681c9fbb7 100644
--- a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
+++ b/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
@@ -1079,6 +1079,15 @@ int QSPIFBlockDevice::_sfdp_detect_and_enable_4byte_addressing(uint8_t *basic_pa
             tr_debug("_sfdp_detect_and_enable_4byte_addressing - 4-byte addressing not supported, falling back to 3-byte addressing");
             _address_size = QSPI_CFG_ADDR_SIZE_24;
         }
+
+        if (_address_size == QSPI_CFG_ADDR_SIZE_32) {
+            // Update 1-1-1 format to match new address size
+            if (QSPI_STATUS_OK != _qspi.configure_format(QSPI_CFG_BUS_SINGLE, QSPI_CFG_BUS_SINGLE, _address_size, QSPI_CFG_BUS_SINGLE,
+                                                         0, QSPI_CFG_BUS_SINGLE, 0)) {
+                tr_error("_qspi_configure_format failed");
+                status = QSPIF_BD_ERROR_DEVICE_ERROR;
+            }
+        }
     }
 
     return status;