Skip to content

Commit 4cf621e

Browse files
author
Yossi Levy
authored
Merge pull request #68 from ARMmbed/mbed-os-5.10.0-oob
Update to Mbed os 5.10.0
2 parents ea5643b + af80f50 commit 4cf621e

File tree

7 files changed

+77
-22
lines changed

7 files changed

+77
-22
lines changed

.travis.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11

22
env:
33
matrix:
4-
- TARGET=K82F
5-
- TARGET=NRF52840_DK
6-
- TARGET=K64F
7-
- TARGET=UBLOX_EVK_ODIN_W2
8-
- TARGET=NUCLEO_F429ZI
4+
95
global:
106
- >
117
STATUS=$'curl -so/dev/null --user $MBED_BOT --request POST
@@ -54,21 +50,12 @@ install:
5450

5551
script:
5652
# Check that example compiles with littlefs + spif
57-
- mbed compile -t GCC_ARM -m $TARGET -j0
58-
59-
# Check that example compiles with littlefs + dataflash
60-
- sed -i 's/SPIFBlockDevice bd/DataFlashBlockDevice bd/g' main.cpp
61-
- sed -i 's/MBED_CONF_SPIF_DRIVER/MBED_CONF_DATAFLASH/g' main.cpp
62-
- mbed compile -t GCC_ARM -m $TARGET -j0
53+
- mbed compile -t GCC_ARM -m K82F -j0
6354

6455
# Check that example compiles with fatfs + sd
56+
- sed -i 's/SPIFBlockDevice bd/SDBlockDevice bd/g' main.cpp
57+
- sed -i 's/MBED_CONF_SPIF_DRIVER/MBED_CONF_SD/g' main.cpp
6558
- sed -i 's/LittleFileSystem fs/FATFileSystem fs/g' main.cpp
66-
- sed -i 's/DataFlashBlockDevice bd/SDBlockDevice bd/g' main.cpp
67-
- sed -i 's/MBED_CONF_DATAFLASH/MBED_CONF_SD/g' main.cpp
68-
- mbed compile -t GCC_ARM -m $TARGET -j0
59+
- mbed compile -t GCC_ARM -m K64F -j0
6960

70-
# Check that example compiles with fatfs + heap
71-
- sed -i 's/SDBlockDevice bd(/HeapBlockDevice bd(1024*512, 512);/g' main.cpp
72-
- sed -i '/MBED_CONF_SD/d' main.cpp
73-
- mbed compile -t GCC_ARM -m $TARGET -j0
7461

README.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,32 @@ pins in `<driver>/mbed_lib.json` are correct. For example, to change the pins fo
261261
...
262262
}
263263
```
264+
The pins macros define above can be override at the application configuration file using the driver prefix before the parameter name.
265+
```
266+
"target_overrides": {
267+
...
268+
"NUCLEO_F429ZI": {
269+
"spif-driver.SPI_MOSI": "PC_12",
270+
"spif-driver.SPI_MISO": "PC_11",
271+
"spif-driver.SPI_CLK": "PC_10",
272+
"spif-driver.SPI_CS": "PA_15"
273+
},
274+
...
275+
}
276+
```
277+
or
278+
```
279+
"target_overrides": {
280+
...
281+
"NUCLEO_F429ZI": {
282+
"sd.SPI_MOSI": "PC_12",
283+
"sd.SPI_MISO": "PC_11",
284+
"sd.SPI_CLK": "PC_10",
285+
"sd.SPI_CS": "PA_15"
286+
},
287+
...
288+
}
289+
```
264290

265291
Mbed OS has several options for the block device:
266292

@@ -277,6 +303,18 @@ Mbed OS has several options for the block device:
277303
MBED_CONF_SPIF_DRIVER_SPI_CS);
278304
```
279305
306+
Starting mbed-os 5.10 the SPIFBlockDevice is a component under mbed-os. In order to add a component to the application use the following `target_overrides` configuration at the application configuration file:
307+
```
308+
"target_overrides": {
309+
...
310+
"NUCLEO_F429ZI": {
311+
"target.components_add": ["SPIF"],
312+
...
313+
},
314+
...
315+
}
316+
```
317+
280318
- **DataFlashBlockDevice** - Block device driver for NOR-based SPI flash devices
281319
that support the DataFlash protocol, such as the Adesto AT45DB series of
282320
devices. DataFlash is a memory protocol that combines flash with SRAM buffers
@@ -293,6 +331,18 @@ Mbed OS has several options for the block device:
293331
MBED_CONF_DATAFLASH_SPI_CS);
294332
```
295333

334+
Starting mbed-os 5.10 the DataFlashBlockDevice is a component under mbed-os. In order to add a component to the application use the following `target_overrides` configuration at the application configuration file:
335+
```
336+
"target_overrides": {
337+
...
338+
"NUCLEO_F429ZI": {
339+
"target.components_add": ["DATAFLASH"],
340+
...
341+
},
342+
...
343+
}
344+
```
345+
296346
- **SDBlockDevice** - Block device driver for SD cards and eMMC memory chips. SD
297347
cards or eMMC chips offer a full FTL layer on top of NAND flash. This makes the
298348
storage well-suited for systems that require a about 1GB of memory.
@@ -307,6 +357,18 @@ Mbed OS has several options for the block device:
307357
MBED_CONF_SD_SPI_CS);
308358
```
309359
360+
Starting mbed-os 5.10 the SDBlockDevice is a component under mbed-os. In order to add a component to the application use the following `target_overrides` configuration at the application configuration file:
361+
```
362+
"target_overrides": {
363+
...
364+
"NUCLEO_F429ZI": {
365+
"target.components_add": ["SD"],
366+
...
367+
},
368+
...
369+
}
370+
```
371+
310372
- [**HeapBlockDevice**](https://os.mbed.com/docs/v5.6/reference/heapblockdevice.html) -
311373
Block device that simulates storage in RAM using the heap. Do not use the heap
312374
block device for storing data persistently because a power loss causes

dataflash-driver.lib

Lines changed: 0 additions & 1 deletion
This file was deleted.

main.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,18 @@
1818
#include <errno.h>
1919

2020
// Block devices
21+
#if COMPONENT_SPIF
2122
#include "SPIFBlockDevice.h"
23+
#endif
24+
25+
#if COMPONENT_DATAFLASH
2226
#include "DataFlashBlockDevice.h"
27+
#endif
28+
29+
#if COMPONENT_SD
2330
#include "SDBlockDevice.h"
31+
#endif
32+
2433
#include "HeapBlockDevice.h"
2534

2635
// File systems

mbed-os.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#0fdfcf7350896a9c0b57c4a18237677abfe25f1a
1+
https://github.com/ARMmbed/mbed-os/#610e35ddc6d59f153173c1e7b2748cf96d6c9bcd

sd-driver.lib

Lines changed: 0 additions & 1 deletion
This file was deleted.

spif-driver.lib

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)