Merge pull request #10610 from ARMmbed/release-candidate

Release candidate for mbed-os-5.12.4

.travis.yml

@@ -164,7 +164,6 @@ matrix:
           pylint>=1.9,<2
           hypothesis>=3,<4
           coverage>=4.5,<5
-          coveralls>=1.5,<2
           "
         - python -m pip install --upgrade pip==18.1
         - python -m pip install --upgrade setuptools==40.4.3
@@ -176,7 +175,6 @@ matrix:
         - python tools/test/pylint.py
         - coverage run -a tools/project.py -S | sed -n '/^Total/p'
         - coverage html
-        - coveralls
 
     - <<: *pytools-vm
       name: "tools-py35"

TESTS/host_tests/rtc_reset.py

@@ -40,7 +40,7 @@ def setup(self):
         """Register callbacks required for the test"""
         self._error = False
         generator = self.rtc_reset_test()
-        generator.next()
+        next(generator)
 
         def run_gen(key, value, time):
             """Run the generator, and fail testing if the iterator stops"""

TESTS/mbed_hal/qspi/flash_configs/flash_configs.h

@@ -40,6 +40,14 @@
 #undef QSPI_CMD_WRITE_DPI
 #undef QSPI_CMD_WRITE_QPI
 
+#elif defined(TARGET_RHOMBIO_L476DMW1K)
+#include "MT25Q_config.h" // MT25QL128ABA1EW7
+/* See STM32L476 Errata Sheet, it is not possible to use Dual-/Quad-mode for the command phase */
+#undef QSPI_CMD_READ_DPI
+#undef QSPI_CMD_READ_QPI
+#undef QSPI_CMD_WRITE_DPI
+#undef QSPI_CMD_WRITE_QPI
+
 #elif defined(TARGET_DISCO_L496AG)
 #include "MX25RXX35F_config.h" // MX25R6435F
 

TESTS/netsocket/udp/udpsocket_echotest.cpp

@@ -29,7 +29,7 @@ namespace {
 static const int SIGNAL_SIGIO_RX = 0x1;
 static const int SIGNAL_SIGIO_TX = 0x2;
 static const int SIGIO_TIMEOUT = 5000; //[ms]
-static const int WAIT2RECV_TIMEOUT = 2000; //[ms]
+static const int WAIT2RECV_TIMEOUT = 5000; //[ms]
 static const int RETRIES = 2;
 
 static const double EXPECTED_LOSS_RATIO = 0.0;

components/TARGET_PSA/TARGET_TFM/tf-m-integration.md

@@ -26,12 +26,12 @@ TF-M is built as bare-metal in a secure target, in order to build a secure targe
 ## Build hooks
 
 Mbed-OS testing tools are designed to work with a single image (`.bin` or `.hex`).
-When building mbed-os for ARMv8-M targets two images are created. One for normal world(NW) and one for TrustZone(TZ).
+When building mbed-os for TF-M targets two images are created. One for normal world(NW) and one for TrustZone(TZ).
 Mbed-OS build system provides `post_binary_hook` that allows executing arbitrary Python script for merging NW and TZ images. Typically `post_binary_hook` is added to NW target and assumes TZ target images as a prerequisite.
 
-## Porting ARMv8-M targets
+## Porting TF-M targets
 
-Typically firmware for ARMv8-M targets consist of 2 or more images: normal world and TrustZone image. More images can be present in case boot loaders are used.
+Typically firmware for TF-M targets consist of 2 or more images: normal world and TrustZone image. More images can be present in case boot loaders are used.
 Two images must be built and linked separately. TrustZone image must be built first.
 
 There may be code and/or header files sharing between the two targets.

components/storage/blockdevice/COMPONENT_SPIF/mbed_lib.json

@@ -32,25 +32,25 @@
              "SPI_CLK":  "PE_12",
              "SPI_CS":   "PE_11"
         },
-         "MTB_ADV_WISE_1530": {
+        "MTB_ADV_WISE_1530": {
              "SPI_MOSI": "PC_3",
              "SPI_MISO": "PC_2",
              "SPI_CLK":  "PB_13",
-             "SPI_CS":   "PC_12"            
+             "SPI_CS":   "PC_12"
        },
-         "MTB_MXCHIP_EMW3166": {
+       "MTB_MXCHIP_EMW3166": {
              "SPI_MOSI": "PB_15",
              "SPI_MISO": "PB_14",
              "SPI_CLK":  "PB_13",
-             "SPI_CS":   "PA_10"            
+             "SPI_CS":   "PA_10"
        },
-         "MTB_USI_WM_BN_BM_22": {
+       "MTB_USI_WM_BN_BM_22": {
              "SPI_MOSI": "PC_3",
              "SPI_MISO": "PC_2",
              "SPI_CLK":  "PB_13",
-             "SPI_CS":   "PA_6"            
+             "SPI_CS":   "PA_6"
        },
-         "MTB_ADV_WISE_1570": {
+       "MTB_ADV_WISE_1570": {
              "SPI_MOSI": "PA_7",
              "SPI_MISO": "PA_6",
              "SPI_CLK":  "PA_5",
@@ -62,6 +62,12 @@
              "SPI_MISO": "PE_13",
              "SPI_CLK":  "PE_12",
              "SPI_CS":   "PE_11"
+       },
+       "MTS_DRAGONFLY_F411RE": {
+           "SPI_MOSI": "SPI3_MOSI",
+           "SPI_MISO": "SPI3_MISO",
+           "SPI_CLK":  "SPI3_SCK",
+           "SPI_CS":   "SPI_CS1"
        }
     }
 }

drivers/SPI.cpp

@@ -83,6 +83,12 @@ void SPI::_do_construct()
         _peripheral->name = name;
     }
     core_util_critical_section_exit();
+
+#if DEVICE_SPI_ASYNCH && TRANSACTION_QUEUE_SIZE_SPI
+    // prime the SingletonPtr, so we don't have a problem trying to
+    // construct the buffer if asynch operation initiated from IRQ
+    _peripheral->transaction_buffer.get();
+#endif
     // we don't need to _acquire at this stage.
     // this will be done anyway before any operation.
 }

features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp

@@ -510,7 +510,7 @@ ble_error_t GattServer::insert_descriptor(
 #endif // BLE_FEATURE_SECURITY
         }
 
-        if (properties & READ_PROPERTY) {
+        if (properties & READ_PROPERTY && !(attribute_it->settings & ATTS_SET_CCC)) {
             attribute_it->settings |= ATTS_SET_READ_CBACK;
         }
     }
@@ -543,7 +543,7 @@ ble_error_t GattServer::insert_descriptor(
 #endif // BLE_FEATURE_SECURITY
         }
 
-        if (properties & WRITABLE_PROPERTIES) {
+        if (properties & WRITABLE_PROPERTIES && !(attribute_it->settings & ATTS_SET_CCC)) {
             attribute_it->settings |= ATTS_SET_WRITE_CBACK;
         }
     }

features/cellular/framework/targets/QUECTEL/BG96/QUECTEL_BG96_CellularStack.cpp

@@ -70,6 +70,7 @@ nsapi_error_t QUECTEL_BG96_CellularStack::socket_connect(nsapi_socket_t handle,
         if ((_at.get_last_error() == NSAPI_ERROR_OK) && err) {
             if (err == BG96_SOCKET_BIND_FAIL) {
                 socket->created = false;
+                _at.unlock();
                 return NSAPI_ERROR_PARAMETER;
             }
             _at.cmd_start("AT+QICLOSE=");
@@ -177,6 +178,7 @@ void QUECTEL_BG96_CellularStack::handle_open_socket_response(int &modem_connect_
     modem_connect_id = _at.read_int();
     err = _at.read_int();
 }
+
 nsapi_error_t QUECTEL_BG96_CellularStack::create_socket_impl(CellularSocket *socket)
 {
     int modem_connect_id = -1;

features/lwipstack/lwip-sys/arch/cc.h

@@ -110,7 +110,7 @@ MBED_NORETURN void lwip_mbed_assert_fail(const char *msg, const char *func, cons
 #else // MBED_CONF_LWIP_USE_MBED_TRACE
 #include <stdio.h>
 
-MBED_NORETURN void assert_printf(char *msg, int line, char *file);
+MBED_NORETURN void assert_printf(const char *msg, int line, const char *file);
 
 /* Plaform specific diagnostic output */
 #define LWIP_PLATFORM_DIAG(vars) printf vars

features/lwipstack/lwip-sys/arch/lwip_sys_arch.c

@@ -605,7 +605,7 @@ MBED_NORETURN void lwip_mbed_assert_fail(const char *msg, const char *func, cons
     \param[in]    line  Line number in file with error
     \param[in]    file  Filename with error
  */
-MBED_NORETURN void assert_printf(char *msg, int line, char *file) {
+MBED_NORETURN void assert_printf(const char *msg, int line, const char *file) {
     if (msg)
         error("%s:%d in file %s\n", msg, line, file);
     else

features/lwipstack/lwipopts.h

@@ -83,7 +83,9 @@
 
 #define SYS_LIGHTWEIGHT_PROT        1
 
+#ifndef LWIP_RAW
 #define LWIP_RAW                    0
+#endif
 
 #define TCPIP_MBOX_SIZE             8
 #define DEFAULT_TCP_RECVMBOX_SIZE   8

features/lwipstack/mbed_lib.json

@@ -176,6 +176,9 @@
         },
         "FVP_MPS2_M3": {
             "mem-size": 36560
+        },
+        "MTS_DRAGONFLY_F411RE": {
+            "tcpip-thread-stacksize": 1600
         }
     }
 }