ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8563 from marcuschangarm/default_qspif 

Add QSPIF block device to default system storage
pull/8598/head
Cruz Monrreal 2018-10-30 22:32:01 -05:00 committed by GitHub
parent 1bbcfff8f3 063a7842ba
commit fba0669194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/storage/blockdevice/COMPONENT_QSPIF/mbed_lib.json
View File

@ -1,20 +1,30 @@
{
"name": "qspif",
"config": {
"QSPI_IO0": "QSPI_FLASH1_IO0",
"QSPI_IO1": "QSPI_FLASH1_IO1",
"QSPI_IO2": "QSPI_FLASH1_IO2",
"QSPI_IO3": "QSPI_FLASH1_IO3",
"QSPI_SCK": "QSPI_FLASH1_SCK",
"QSPI_CSN": "QSPI_FLASH1_CSN",
"QSPI_POLARITY_MODE": 0,
"QSPI_FREQ": "40000000"
},
"target_overrides": {
"DISCO_F413ZH": {
"QSPI_FREQ": "80000000"
"QSPI_FREQ": "80000000"
},
"DISCO_L475VG_IOT01A": {
"QSPI_FREQ": "8000000"
"DISCO_L475VG_IOT01A": {
"QSPI_FREQ": "8000000"
},
"DISCO_L476VG": {
"QSPI_FREQ": "80000000"
"DISCO_L476VG": {
"QSPI_FREQ": "80000000"
},
"DISCO_F469NI": {
"QSPI_FREQ": "80000000"
"DISCO_F469NI": {
"QSPI_FREQ": "80000000"
},
"NRF52840_DK": {
"QSPI_FREQ": "32000000"
}
}
}

23
features/storage/system_storage/SystemStorage.cpp
View File

@ -22,6 +22,10 @@
#include "SPIFBlockDevice.h"
#endif
#if COMPONENT_QSPIF
#include "QSPIFBlockDevice.h"
#endif
#if COMPONENT_DATAFLASH
#include "DataFlashBlockDevice.h"
#endif
@ -60,6 +64,21 @@ MBED_WEAK BlockDevice *BlockDevice::get_default_instance()
return &default_bd;
#elif COMPONENT_QSPIF
static QSPIFBlockDevice default_bd(
MBED_CONF_QSPIF_QSPI_IO0,
MBED_CONF_QSPIF_QSPI_IO1,
MBED_CONF_QSPIF_QSPI_IO2,
MBED_CONF_QSPIF_QSPI_IO3,
MBED_CONF_QSPIF_QSPI_SCK,
MBED_CONF_QSPIF_QSPI_CSN,
MBED_CONF_QSPIF_QSPI_POLARITY_MODE,
MBED_CONF_QSPIF_QSPI_FREQ
);
return &default_bd;
#elif COMPONENT_DATAFLASH
static DataFlashBlockDevice default_bd(
@ -112,7 +131,7 @@ MBED_WEAK BlockDevice *BlockDevice::get_default_instance()
#endif
return &default_bd;
#else
return NULL;
@ -123,7 +142,7 @@ MBED_WEAK BlockDevice *BlockDevice::get_default_instance()
MBED_WEAK FileSystem *FileSystem::get_default_instance()
{
#if COMPONENT_SPIF || COMPONENT_DATAFLASH
#if COMPONENT_SPIF || COMPONENT_QSPIF || COMPONENT_DATAFLASH
static LittleFileSystem flash("flash", BlockDevice::get_default_instance());
flash.set_as_default();