Skip to content

Commit de882e6

Browse files
author
Jamie Smith
authored
Move SPINAND flash out of the Mbed source tree (#295)
* Move SPINAND flash out of the Mbed source tree * Also remove from drivers.json5 * Fix comment
1 parent 8826c61 commit de882e6

File tree

7 files changed

+4
-1207
lines changed

7 files changed

+4
-1207
lines changed

storage/blockdevice/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ if("DEVICE_SPI=1" IN_LIST MBED_TARGET_DEFINITIONS)
4646
add_subdirectory(COMPONENT_SPIF)
4747
endif()
4848

49-
if("DEVICE_QSPI=1" IN_LIST MBED_TARGET_DEFINITIONS)
50-
add_subdirectory(COMPONENT_SPINAND)
51-
endif()
52-
53-
5449
target_include_directories(mbed-storage-blockdevice
5550
PUBLIC
5651
.

storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ enum qspif_bd_error {
5959
QSPIF_BD_ERROR_WREN_FAILED = -4004, /* Write Enable Failed */
6060
QSPIF_BD_ERROR_INVALID_ERASE_PARAMS = -4005, /* Erase command not on sector aligned addresses or exceeds device size */
6161
QSPIF_BD_ERROR_DEVICE_NOT_UNIQUE = -4006, /* Only one instance per csel is allowed */
62-
QSPIF_BD_ERROR_DEVICE_MAX_EXCEED = -4007 /* Max active QSPIF devices exceeded */
62+
QSPIF_BD_ERROR_DEVICE_MAX_EXCEED = -4007, /* Max active QSPIF devices exceeded */
63+
QSPIF_BD_ERROR_INVALID_ARGUMENT = -4008 /* Invalid argument passed to function */
6364
};
6465

6566
/** Enum qspif polarity mode
@@ -248,7 +249,7 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
248249
*/
249250
virtual const char *get_type() const;
250251

251-
private:
252+
protected:
252253
/********************************/
253254
/* Different Device Csel Mgmt */
254255
/********************************/
@@ -334,7 +335,7 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
334335
// Detect 4-byte addressing mode and enable it if supported
335336
int _sfdp_detect_and_enable_4byte_addressing(uint8_t *basic_param_table_ptr, int basic_param_table_size);
336337

337-
private:
338+
protected:
338339
enum qspif_clear_protection_method_t {
339340
QSPIF_BP_ULBPR, // Issue global protection unlock instruction
340341
QSPIF_BP_CLEAR_SR, // Clear protection bits in status register 1

storage/blockdevice/COMPONENT_SPINAND/CMakeLists.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

storage/blockdevice/COMPONENT_SPINAND/include/SPINAND/SPINANDBlockDevice.h

Lines changed: 0 additions & 325 deletions
This file was deleted.

0 commit comments

Comments
 (0)