Revision 25:65a9183a2178, committed 2018-09-26

Comitter:

mbed_official

Date:

Wed Sep 26 15:01:07 2018 +0100

Parent:

24:54f958b463d0

Child:

26:06d3aa3eff55

Commit message:

Merge pull request #68 from ARMmbed/mbed-os-5.10.0-oob

Update to Mbed os 5.10.0
.
Commit copied from https://github.com/ARMmbed/mbed-os-example-filesystem

Changed in this revision

--- a/.travis.yml	Thu Sep 06 20:15:17 2018 +0100
+++ b/.travis.yml	Wed Sep 26 15:01:07 2018 +0100
@@ -1,11 +1,7 @@
 
 env:
   matrix:
-    - TARGET=K82F
-    - TARGET=NRF52840_DK
-    - TARGET=K64F
-    - TARGET=UBLOX_EVK_ODIN_W2
-    - TARGET=NUCLEO_F429ZI
+    
   global:
     - >
       STATUS=$'curl -so/dev/null --user $MBED_BOT --request POST
@@ -54,21 +50,12 @@
 
 script:
   # Check that example compiles with littlefs + spif
-  - mbed compile -t GCC_ARM -m $TARGET -j0
-
-  # Check that example compiles with littlefs + dataflash
-  - sed -i 's/SPIFBlockDevice bd/DataFlashBlockDevice bd/g' main.cpp
-  - sed -i 's/MBED_CONF_SPIF_DRIVER/MBED_CONF_DATAFLASH/g' main.cpp
-  - mbed compile -t GCC_ARM -m $TARGET -j0
+  - mbed compile -t GCC_ARM -m K82F -j0
 
   # Check that example compiles with fatfs + sd
+  - sed -i 's/SPIFBlockDevice bd/SDBlockDevice bd/g' main.cpp
+  - sed -i 's/MBED_CONF_SPIF_DRIVER/MBED_CONF_SD/g' main.cpp
   - sed -i 's/LittleFileSystem fs/FATFileSystem fs/g' main.cpp
-  - sed -i 's/DataFlashBlockDevice bd/SDBlockDevice bd/g' main.cpp
-  - sed -i 's/MBED_CONF_DATAFLASH/MBED_CONF_SD/g' main.cpp
-  - mbed compile -t GCC_ARM -m $TARGET -j0
+  - mbed compile -t GCC_ARM -m K64F -j0
 
-  # Check that example compiles with fatfs + heap
-  - sed -i 's/SDBlockDevice bd(/HeapBlockDevice bd(1024*512, 512);/g' main.cpp
-  - sed -i '/MBED_CONF_SD/d' main.cpp
-  - mbed compile -t GCC_ARM -m $TARGET -j0
 

--- a/README.md	Thu Sep 06 20:15:17 2018 +0100
+++ b/README.md	Wed Sep 26 15:01:07 2018 +0100
@@ -261,6 +261,32 @@
          ...
      }
 ```
+The pins macros define above can be override at the application configuration file using the driver prefix before the parameter name.
+```
+   "target_overrides": {
+         ...
+         "NUCLEO_F429ZI": {
+             "spif-driver.SPI_MOSI": "PC_12",
+             "spif-driver.SPI_MISO": "PC_11",
+             "spif-driver.SPI_CLK":  "PC_10",
+             "spif-driver.SPI_CS":   "PA_15"
+         },
+         ...
+     }
+```
+or 
+```
+   "target_overrides": {
+         ...
+         "NUCLEO_F429ZI": {
+             "sd.SPI_MOSI": "PC_12",
+             "sd.SPI_MISO": "PC_11",
+             "sd.SPI_CLK":  "PC_10",
+             "sd.SPI_CS":   "PA_15"
+         },
+         ...
+     }
+```
 
 Mbed OS has several options for the block device:
 
@@ -277,6 +303,18 @@
           MBED_CONF_SPIF_DRIVER_SPI_CS);
   ```
 
+  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:
+```
+  "target_overrides": {
+         ...
+         "NUCLEO_F429ZI": {
+             "target.components_add": ["SPIF"],
+             ...
+         },
+         ...
+  }
+```
+
 - **DataFlashBlockDevice** - Block device driver for NOR-based SPI flash devices
   that support the DataFlash protocol, such as the Adesto AT45DB series of
   devices. DataFlash is a memory protocol that combines flash with SRAM buffers
@@ -293,6 +331,18 @@
           MBED_CONF_DATAFLASH_SPI_CS);
   ```
 
+  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:
+```
+  "target_overrides": {
+         ...
+         "NUCLEO_F429ZI": {
+             "target.components_add": ["DATAFLASH"],
+             ...
+         },
+         ...
+  }
+```
+
 - **SDBlockDevice** - Block device driver for SD cards and eMMC memory chips. SD
   cards or eMMC chips offer a full FTL layer on top of NAND flash. This makes the
   storage well-suited for systems that require a about 1GB of memory.
@@ -307,6 +357,18 @@
           MBED_CONF_SD_SPI_CS);
   ```
 
+  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:
+```
+  "target_overrides": {
+         ...
+         "NUCLEO_F429ZI": {
+             "target.components_add": ["SD"],
+             ...
+         },
+         ...
+  }
+```
+
 - [**HeapBlockDevice**](https://os.mbed.com/docs/v5.6/reference/heapblockdevice.html) -
   Block device that simulates storage in RAM using the heap. Do not use the heap
   block device for storing data persistently because a power loss causes

--- a/dataflash-driver.lib	Thu Sep 06 20:15:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://github.com/ARMmbed/dataflash-driver/#eb1316530ffe0c2ba934b5aee158a0a08ff0388b

--- a/main.cpp	Thu Sep 06 20:15:17 2018 +0100
+++ b/main.cpp	Wed Sep 26 15:01:07 2018 +0100
@@ -18,9 +18,18 @@
 #include <errno.h>
 
 // Block devices
+#if COMPONENT_SPIF
 #include "SPIFBlockDevice.h"
+#endif
+
+#if COMPONENT_DATAFLASH
 #include "DataFlashBlockDevice.h"
+#endif 
+
+#if COMPONENT_SD
 #include "SDBlockDevice.h"
+#endif 
+
 #include "HeapBlockDevice.h"
 
 // File systems

--- a/mbed-os.lib	Thu Sep 06 20:15:17 2018 +0100
+++ b/mbed-os.lib	Wed Sep 26 15:01:07 2018 +0100
@@ -1,1 +1,1 @@
-https://github.com/ARMmbed/mbed-os/#0fdfcf7350896a9c0b57c4a18237677abfe25f1a
+https://github.com/ARMmbed/mbed-os/#610e35ddc6d59f153173c1e7b2748cf96d6c9bcd

--- a/sd-driver.lib	Thu Sep 06 20:15:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://github.com/ARMmbed/sd-driver/#c16fa2bf36b87e862f81e0b30dbddca1460e1084

--- a/spif-driver.lib	Thu Sep 06 20:15:17 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-https://github.com/ARMmbed/spif-driver/#e5e6616914a23fb11a5ae8b5c9cbfb8a600c64b2