modify config file

Author: rogeryou

storage/blockdevice/COMPONENT_OSPIF/include/OSPIF/MX25LM51245G_config.h

@@ -25,10 +25,13 @@
 // The code below can be removed when users test with the new flash.
 #define NEED_DEFINE_SFDP_PARA
 
-#define MX25LM51245G_FLASH_SIZE                   0x4000000 /* 512 MBits => 64 MBytes */
-#define MX25LM51245G_BLOCK_SIZE                   0x10000   /* 1024 blocks of 64 KBytes */
-#define MX25LM51245G_SECTOR_SIZE                  0x1000    /* 16384 sectors of 4 kBytes */
-#define MX25LM51245G_PAGE_SIZE                    0x100     /* 262144 pages of 256 bytes */
-#define MX25LM51245G_CHUNK_SIZE                   0x10      /* fred: 16 bytes */
+#define OSPIF_CR2_OPI_EN_ADDR      0x00000000
+
+#define MX_FLASH_BLOCK_SIZE        0x10000    /* 1024 blocks of 64 KBytes */
+#define MX_FLASH_SECTOR_SIZE       0x1000     /* 16384 sectors of 4 kBytes */
+#define MX_FLASH_PAGE_SIZE         0x100      /* 262144 pages of 256 bytes */
+#define MX_FLASH_CHUNK_SIZE        0x10       /* 16 bytes */
+#define MX_FLASH_BANK_SIZE         0x01000000 /* 16 MBytes */
+#define MX_FLASH_BANK_SIZE_MASK    ~(MX_FLASH_BANK_SIZE - 1) /* 0xFF000000 */
 
 #endif // MBED_OSPI_FLASH_MX25LM51245G_H

storage/blockdevice/COMPONENT_OSPIF/include/OSPIF/MX25LW51245G_config.h

@@ -0,0 +1,44 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MBED_OSPI_FLASH_MX25LW51245G_H
+#define MBED_OSPI_FLASH_MX25LW51245G_H
+
+#define OSPI_FLASH_CHIP_STRING "macronix MX25LW51245G"
+
+// This is a workaround,
+// The sfdp parameter values in Macronix old octaflash(include the MX25LW51245G on L4R9I_DISCO) are all 0xFF,
+// so we need to define the parameter values by software to support SFDP parsing.
+// The code below can be removed when users test with the new flash.
+#define NEED_DEFINE_SFDP_PARA
+
+#define MX_FLASH_SUPPORT_RWW 1
+
+// Configuration Register2 address
+#define OSPIF_CR2_OPI_EN_ADDR         0x00000000
+#define OSPIF_CR2_BANK_STATUS_ADDR    0xc0000000
+#define OSPIF_CR2_RWWDI               ((uint8_t)0x00)        /*!< No active program or erase operation */
+#define OSPIF_CR2_RWWDS               ((uint8_t)0x01)        /*!< Program/erase in other bank */
+#define OSPIF_CR2_RWWBS               ((uint8_t)0x03)        /*!< program/erase operation in addressed bank */
+
+#define MX_FLASH_BLOCK_SIZE           0x10000    /* 1024 blocks of 64 KBytes */
+#define MX_FLASH_SECTOR_SIZE          0x1000     /* 16384 sectors of 4 kBytes */
+#define MX_FLASH_PAGE_SIZE            0x100      /* 262144 pages of 256 bytes */
+#define MX_FLASH_CHUNK_SIZE           0x10       /* 16 bytes */
+#define MX_FLASH_BANK_SIZE            0x01000000 /* 16 MBytes */
+#define MX_FLASH_BANK_SIZE_MASK       ~(MX_FLASH_BANK_SIZE - 1) /* 0xFF000000 */
+
+#endif // MBED_OSPI_FLASH_MX25LW51245G_H

storage/blockdevice/COMPONENT_OSPIF/source/OSPIFBlockDevice.cpp

@@ -407,7 +407,7 @@ int OSPIFBlockDevice::read(void *buffer, bd_addr_t addr, bd_size_t size)
 
 #ifdef MX_FLASH_SUPPORT_RWW
     bool need_wait;
-    need_wait = (_wait_flag != NOT_STARTED) && ((addr & MX25LW51245G_BANK_SIZE_MASK) == _busy_bank);
+    need_wait = (_wait_flag != NOT_STARTED) && ((addr & MX_FLASH_BANK_SIZE_MASK) == _busy_bank);
 
     // Wait for ready
     if (need_wait) {
@@ -499,7 +499,7 @@ int OSPIFBlockDevice::program(const void *buffer, bd_addr_t addr, bd_size_t size
 
 #ifdef MX_FLASH_SUPPORT_RWW
         _wait_flag = WRITE_WAIT_STARTED;
-        _busy_bank = addr & MX25LW51245G_BANK_SIZE_MASK;
+        _busy_bank = addr & MX_FLASH_BANK_SIZE_MASK;
 
         _mutex.unlock();
 
@@ -606,7 +606,7 @@ int OSPIFBlockDevice::erase(bd_addr_t addr, bd_size_t size)
 
 #ifdef MX_FLASH_SUPPORT_RWW
         _wait_flag = ERASE_WAIT_STARTED;
-        _busy_bank = addr & MX25LW51245G_BANK_SIZE_MASK;
+        _busy_bank = addr & MX_FLASH_BANK_SIZE_MASK;
 
         _mutex.unlock();
 
@@ -1631,7 +1631,7 @@ bool OSPIFBlockDevice::_is_mem_ready_rww(bd_addr_t addr, uint8_t rw)
     static uint32_t rww_cnt = 0;   // For testing
     static uint32_t rwe_cnt = 0;   // For testing
 
-    bd_addr_t bank_addr = addr & MX25LW51245G_BANK_SIZE_MASK;
+    bd_addr_t bank_addr = addr & MX_FLASH_BANK_SIZE_MASK;
 
     if ((_wait_flag == NOT_STARTED) || (!rw && bank_addr != _busy_bank)) {
         return mem_ready;