Merge pull request ARMmbed#10763 from ARMmbed/release-candidate

Release candidate for mbed-os-5.13.0-rc2

Author: 0xc0170

features/FEATURE_BLE/targets/TARGET_CORDIO/mbed_lib.json

@@ -24,12 +24,12 @@
         },
         "max-l2cap-channels": {
             "help": "Maximum number of connection oriented channels",
-            "value": 8,
+            "value": 1,
             "macro_name": "L2C_COC_CHAN_MAX"
         },
         "max-l2cap-clients": {
             "help": "Maximum number of connection oriented channel registered clients",
-            "value": 4,
+            "value": 1,
             "macro_name": "L2C_COC_REG_MAX"
         },
         "max-att-writes": {
@@ -53,7 +53,7 @@
         },
         "rx-acl-buffer-size": {
             "help": "Size of the buffer holding the reassembled complete ACL packet. This will limit the effective ATT_MTU (to its value minus 4 bytes for the header). The size of the buffer must be small enough to be allocated from the existing cordio pool. If this value is increased you may need to adjust the memory pool.",
-            "value": 100
+            "value": 70
         },
         "max-prepared-writes": {
             "help": "Number of queued prepare writes supported by server.",

features/FEATURE_BLE/targets/TARGET_CORDIO_LL/mbed_lib.json

@@ -3,11 +3,11 @@
     "config": {
         "max-advertising-sets": {
             "help": "Maximum number of advertising sets.",
-            "value": 4
+            "value": 3
         },
         "max-advertising-reports": {
             "help": "Maximum number of pending legacy or extended advertising reports.",
-            "value": 8
+            "value": 4
         },
         "default-extended-advertising-fragmentation-size": {
             "help": "Default extended advertising data fragmentation size.",
@@ -23,23 +23,23 @@
         },
         "rx-buffers": {
             "help": "Default number of receive buffers.",
-            "value": 8
+            "value": 4
         },
         "phy-coded-support": {
             "help": "Coded PHY supported.",
             "value": 0
         },
         "extended-advertising-size": {
-            "help": "Maximum extended advertising data (and scan data response) size",
-            "value": 128
+            "help": "Maximum extended advertising data (and scan data response) size, Minimum value is 251",
+            "value": 251
         },
         "max-acl-size": {
             "help": "Maximum ACL buffer size",
             "value": 256
         },
         "tx-buffers": {
             "help": "Default number of send buffers",
-            "value": 8
+            "value": 4
         },
         "handle-vendor-specific-hci-commands": {
             "help": "Handle VS HCI commands. Valid values are 0 (ignore) and 1 (handle).",

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_MCU_NRF52840/mbed_lib.json

@@ -7,15 +7,15 @@
         },
         "extended-advertising-size": {
             "help": "Maximum extended advertising data (and scan data response) size",
-            "value": 1650
+            "value": 512
         },
         "max-acl-size": {
             "help": "Maximum ACL buffer size",
-            "value": 512
+            "value": 256
         },
         "tx-buffers": {
             "help": "Default number of send buffers",
-            "value": 16
+            "value": 4
         },
         "cryptocell310-acceleration": {
             "help": "Should the link layer use the Crypto Cell 310 to offload encryption.",

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp

@@ -67,11 +67,11 @@ using namespace ble::vendor::cordio;
 #define MBED_CONF_CORDIO_LL_TX_BUFFERS                MBED_CONF_CORDIO_LL_NRF52840_TX_BUFFERS
 #define MBED_CONF_CORDIO_LL_PHY_CODED_SUPPORT         MBED_CONF_CORDIO_LL_NRF52840_PHY_CODED_SUPPORT
 
-#define CORDIO_LL_MEMORY_FOOTPRINT  41906UL
+#define CORDIO_LL_MEMORY_FOOTPRINT  15400UL
 
 #else
 
-#define CORDIO_LL_MEMORY_FOOTPRINT  12768UL
+#define CORDIO_LL_MEMORY_FOOTPRINT  12500UL
 
 #endif
 
@@ -235,9 +235,9 @@ ble::vendor::cordio::buf_pool_desc_t NRFCordioHCIDriver::get_buffer_pool_descrip
 {
     static union {
         #if defined(NRF52840_XXAA)
-        uint8_t buffer[ 17304 ];
+        uint8_t buffer[ 4900 ];
         #else
-        uint8_t buffer[ 8920 ];
+        uint8_t buffer[ 4900 ];
         #endif
         uint64_t align;
     };
@@ -246,8 +246,7 @@ ble::vendor::cordio::buf_pool_desc_t NRFCordioHCIDriver::get_buffer_pool_descrip
             {  32, 16 + 4 },
             {  64, 8 },
             { 128, 4 + MBED_CONF_CORDIO_LL_MAX_ADVERTISING_REPORTS },
-		    { aclBufSize, MBED_CONF_CORDIO_LL_TX_BUFFERS + MBED_CONF_CORDIO_LL_RX_BUFFERS },
-            { 272, 1 }
+		    { aclBufSize, MBED_CONF_CORDIO_LL_TX_BUFFERS + MBED_CONF_CORDIO_LL_RX_BUFFERS }
     };
 
     return buf_pool_desc_t(buffer, pool_desc);

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/mbed_lib.json

@@ -14,6 +14,7 @@
         "INIT_PERIPHERAL",
         "INIT_ENCRYPTED",
         "LHCI_ENABLE_VS=0",
-        "BB_CLK_RATE_HZ=1000000"
+        "BB_CLK_RATE_HZ=1000000",
+        "LL_MAX_PER_SCAN=3"
     ]
 }

features/mbedtls/platform/inc/platform_mbed.h

@@ -33,6 +33,14 @@
 #define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO mbed_default_seed_write
 #endif
 
+/* Automatically enable the Mbed Crypto entropy injection API if
+ * MBEDTLS_ENTROPY_NV_SEED is enabled. WARNING: the current implementation of
+ * the Mbed Crypto entropy injection API is incompatible with other entropy
+ * sources. When MBEDTLS_ENTROPY_NV_SEED is used on PSA target, the NV Seed is
+ * the sole source of entropy and all other entropy sources are ignored. */
+#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+#define MBEDTLS_PSA_INJECT_ENTROPY
+
 #endif  // (defined(TARGET_PSA) && defined(MBEDTLS_ENTROPY_NV_SEED))
 
 #if DEVICE_TRNG

requirements.txt

@@ -17,7 +17,7 @@ mbed-host-tests>=1.4.4,<1.6
 mbed-greentea>=0.2.24,<1.8
 beautifulsoup4>=4,<=4.6.3
 pyelftools>=0.24,<=0.25
-manifest-tool==1.4.8
+manifest-tool==1.5.2
 icetea>=1.2.1,<1.3
 pycryptodome>=3.7.2,<=3.7.3
 pyusb>=1.0.0,<2.0.0

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_4343W/device/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S

@@ -735,15 +735,7 @@ sdhc_1_interrupt_general_IRQHandler
 
                 ELSE
 
-                EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap PROC
-                LDR     R0, =Heap_Mem
-                LDR     R1, =(Stack_Mem + Stack_Size)
-                LDR     R2, =(Heap_Mem +  Heap_Size)
-                LDR     R3, =Stack_Mem
-                BX      LR
-                ENDP
+                IMPORT __use_two_region_memory
 
                 ALIGN
 

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_BLE/device/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S

@@ -672,15 +672,7 @@ pass_interrupt_dacs_IRQHandler
 
                 ELSE
 
-                EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap PROC
-                LDR     R0, =Heap_Mem
-                LDR     R1, =(Stack_Mem + Stack_Size)
-                LDR     R2, =(Heap_Mem +  Heap_Size)
-                LDR     R3, =Stack_Mem
-                BX      LR
-                ENDP
+                IMPORT __use_two_region_memory
 
                 ALIGN
 

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/device/TARGET_MCU_PSOC6_M0/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S

@@ -295,15 +295,7 @@ NvicMux31_IRQHandler
 
                 ELSE
 
-                EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap PROC
-                LDR     R0, =Heap_Mem
-                LDR     R1, =(Stack_Mem + Stack_Size)
-                LDR     R2, =(Heap_Mem +  Heap_Size)
-                LDR     R3, =Stack_Mem
-                BX      LR
-                ENDP
+                IMPORT __use_two_region_memory
 
                 ALIGN
 

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CKIT_062_WIFI_BT/device/TARGET_MCU_PSOC6_M4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S

@@ -672,15 +672,7 @@ pass_interrupt_dacs_IRQHandler
 
                 ELSE
 
-                EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap PROC
-                LDR     R0, =Heap_Mem
-                LDR     R1, =(Stack_Mem + Stack_Size)
-                LDR     R2, =(Heap_Mem +  Heap_Size)
-                LDR     R3, =Stack_Mem
-                BX      LR
-                ENDP
+                IMPORT __use_two_region_memory
 
                 ALIGN
 

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CY8CMOD_062_4343W/device/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S

@@ -735,15 +735,7 @@ sdhc_1_interrupt_general_IRQHandler
 
                 ELSE
 
-                EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap PROC
-                LDR     R0, =Heap_Mem
-                LDR     R1, =(Stack_Mem + Stack_Size)
-                LDR     R2, =(Heap_Mem +  Heap_Size)
-                LDR     R3, =Stack_Mem
-                BX      LR
-                ENDP
+                IMPORT __use_two_region_memory
 
                 ALIGN
 

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/device/TARGET_MCU_PSOC6_M0/TOOLCHAIN_ARM/startup_psoc6_01_cm0plus.S

@@ -295,15 +295,7 @@ NvicMux31_IRQHandler
 
                 ELSE
 
-                EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap PROC
-                LDR     R0, =Heap_Mem
-                LDR     R1, =(Stack_Mem + Stack_Size)
-                LDR     R2, =(Heap_Mem +  Heap_Size)
-                LDR     R3, =Stack_Mem
-                BX      LR
-                ENDP
+                IMPORT __use_two_region_memory
 
                 ALIGN
 

targets/TARGET_Cypress/TARGET_PSOC6/TARGET_CYW943012P6EVB_01/device/TARGET_MCU_PSOC6_M4/TOOLCHAIN_ARM/startup_psoc6_01_cm4.S

@@ -672,15 +672,7 @@ pass_interrupt_dacs_IRQHandler
 
                 ELSE
 
-                EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap PROC
-                LDR     R0, =Heap_Mem
-                LDR     R1, =(Stack_Mem + Stack_Size)
-                LDR     R2, =(Heap_Mem +  Heap_Size)
-                LDR     R3, =Stack_Mem
-                BX      LR
-                ENDP
+                IMPORT __use_two_region_memory
 
                 ALIGN
 

tools/profiles/debug.json

@@ -18,7 +18,7 @@
     "ARMC6": {
         "common": ["-c", "--target=arm-arm-none-eabi", "-mthumb", "-g", "-O1",
                    "-Wno-armcc-pragma-push-pop", "-Wno-armcc-pragma-anon-unions",
-                   "-Wno-reserved-user-defined-literal",
+                   "-Wno-reserved-user-defined-literal", "-Wno-deprecated-register",
                    "-DMULADDC_CANNOT_USE_R7", "-fdata-sections",
                    "-fno-exceptions", "-MMD", "-D_LIBCPP_EXTERN_TEMPLATE(...)=",
                    "-fshort-enums", "-fshort-wchar", "-DMBED_DEBUG",

tools/profiles/develop.json

@@ -17,7 +17,7 @@
     "ARMC6": {
         "common": ["-c", "--target=arm-arm-none-eabi", "-mthumb", "-Os",
                    "-Wno-armcc-pragma-push-pop", "-Wno-armcc-pragma-anon-unions",
-                   "-Wno-reserved-user-defined-literal",
+                   "-Wno-reserved-user-defined-literal", "-Wno-deprecated-register",
                    "-DMULADDC_CANNOT_USE_R7", "-fdata-sections",
                    "-fno-exceptions", "-MMD", "-D_LIBCPP_EXTERN_TEMPLATE(...)=",
                    "-fshort-enums", "-fshort-wchar", "-DMBED_TRAP_ERRORS_ENABLED=1"],

tools/profiles/release.json

@@ -17,7 +17,7 @@
     "ARMC6": {
         "common": ["-c", "--target=arm-arm-none-eabi", "-mthumb", "-Oz",
                    "-Wno-armcc-pragma-push-pop", "-Wno-armcc-pragma-anon-unions",
-                   "-Wno-reserved-user-defined-literal",
+                   "-Wno-reserved-user-defined-literal", "-Wno-deprecated-register",
                    "-DMULADDC_CANNOT_USE_R7", "-fdata-sections",
                    "-fno-exceptions", "-MMD", "-D_LIBCPP_EXTERN_TEMPLATE(...)=",
                    "-fshort-enums", "-fshort-wchar", "-DNDEBUG"],