Merge pull request #10204 from ARMmbed/release-candidate

Release candidate for mbed-os-5.12.0-rc4

features/cellular/framework/AT/AT_CellularContext.cpp

@@ -253,7 +253,7 @@ nsapi_error_t AT_CellularContext::set_blocking(bool blocking)
 
 void AT_CellularContext::set_plmn(const char *plmn)
 {
-    tr_info("CellularContext plmn %s", plmn);
+    tr_info("CellularContext plmn %s", (plmn ? plmn : "NULL"));
     _device->set_plmn(plmn);
 }
 

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

@@ -20,6 +20,7 @@
 #include "QUECTEL_BG96_CellularStack.h"
 #include "QUECTEL_BG96_CellularInformation.h"
 #include "QUECTEL_BG96_CellularContext.h"
+#include "CellularLog.h"
 
 using namespace mbed;
 using namespace events;

features/mbedtls/VERSION.txt

@@ -1 +1 @@
-development
+mbedtls-2.17.0

features/mbedtls/importer/Makefile

@@ -27,7 +27,7 @@
 #
 
 # Set the mbed TLS release to import (this can/should be edited before import)
-MBED_TLS_RELEASE ?= development
+MBED_TLS_RELEASE ?= mbedtls-2.17.0
 MBED_TLS_REPO_URL ?= git@github.com:ARMmbed/mbedtls.git
 
 # Translate between mbed TLS namespace and mbed namespace

features/mbedtls/mbed-crypto/VERSION.txt

@@ -1 +1 @@
-mbedcrypto-1.0.0d7
+mbedcrypto-1.0.0

features/mbedtls/mbed-crypto/importer/Makefile

@@ -29,7 +29,7 @@
 
 # Set the Mbed Crypto release to import (this can/should be edited before
 # import)
-CRYPTO_RELEASE ?= mbedcrypto-1.0.0d7
+CRYPTO_RELEASE ?= mbedcrypto-1.0.0
 CRYPTO_REPO_URL ?= git@github.com:ARMmbed/mbed-crypto.git
 
 # Translate between Mbed Crypto namespace and Mbed OS namespace

targets/targets.json

@@ -2594,7 +2594,7 @@
     },
     "MTB_MXCHIP_EMW3166": {
         "inherits": ["FAMILY_STM32"],
-        "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
+        "supported_toolchains": ["ARMC6", "GCC_ARM", "IAR"],
         "core": "Cortex-M4F",
         "extra_labels_add": [
             "STM32F4",
@@ -2627,7 +2627,7 @@
     },
     "USI_WM_BN_BM_22": {
         "inherits": ["FAMILY_STM32"],
-        "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
+        "supported_toolchains": ["ARMC6", "GCC_ARM", "IAR"],
         "components_add": ["SPIF", "FLASHIAP"],
         "core": "Cortex-M4F",
         "extra_labels_add": [
@@ -5273,7 +5273,7 @@
     "RZ_A1XX": {
         "inherits": ["Target"],
         "core": "Cortex-A9",
-        "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
+        "supported_toolchains": ["ARMC6", "GCC_ARM", "IAR"],
         "extra_labels": ["RENESAS", "RZ_A1XX"],
         "device_has": [
             "SLEEP",
@@ -8085,7 +8085,7 @@
             "public-ram-start": "0x08047600",
             "public-ram-size": "0x200"
         },
-        "device_name": "CY8C6247BZI-D54",
+        "sectors": [[268435456, 512]],
         "bootloader_supported": true
     },
     "CY8CMOD_062_4343W": {
@@ -8117,7 +8117,7 @@
         "post_binary_hook": {
             "function": "PSOC6Code.complete"
         },
-        "device_name": "CY8C6347BZI-BLD53",
+        "sectors": [[268443648, 512]],
         "bootloader_supported": true
     },
     "CY8CKIT_062_4343W": {

tools/arm_pack_manager/index.json

@@ -462778,56 +462778,5 @@
         ], 
         "vendor": "Nordic Semiconductor:54"
     },
-   "CY8C6347BZI-BLD53": {
-        "core": "Cortex-M4",
-        "vendor": "Cypress",
-        "sectors": [
-            [
-                268435456,
-                512
-            ]   
-        ],
-	    "memories": {
-            "IROM1": {
-                "access": {
-                    "execute": true, 
-                    "non_secure": true, 
-                    "non_secure_callable": false, 
-                    "peripheral": false, 
-                    "read": true, 
-                    "secure": false, 
-                    "write": true
-                }, 
-                "default": true, 
-                "start": "0x10002000",
-                "size": "0x000FE000"
-            }
-        }
-   },
-   "CY8C6247BZI-D54": {
-        "core": "Cortex-M4",
-        "vendor": "Cypress",
-        "sectors": [
-            [
-                268435456,
-                512
-            ]   
-        ],
-	    "memories": {
-            "IROM1": {
-                "access": {
-                    "execute": true, 
-                    "non_secure": true, 
-                    "non_secure_callable": false, 
-                    "peripheral": false, 
-                    "read": true, 
-                    "secure": false, 
-                    "write": true
-                }, 
-                "start": "0x10040000",
-                "size": "0xB8000"
-            }
-        }
-   },
     "version": "0.2.0"
 }

tools/build.py

@@ -29,24 +29,24 @@
 sys.path.insert(0, ROOT)
 
 
-from tools.toolchains import TOOLCHAINS, TOOLCHAIN_CLASSES, TOOLCHAIN_PATHS
-from tools.toolchains import mbedToolchain
-from tools.targets import TARGET_NAMES, TARGET_MAP, Target
+from tools.toolchains import TOOLCHAINS
+from tools.targets import TARGET_NAMES, Target
 from tools.options import get_default_options_parser
 from tools.options import extract_profile
 from tools.options import extract_mcus
 from tools.build_api import build_library, build_mbed_libs, build_lib
 from tools.build_api import mcu_toolchain_matrix
 from tools.build_api import print_build_results
-from tools.build_api import get_toolchain_name
-from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT
-from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT, CLI_COLOR_MAP
+from tools.build_api import target_supports_toolchain
+from tools.build_api import find_valid_toolchain
 from tools.notifier.term import TerminalNotifier
 from tools.utils import argparse_filestring_type, args_error, argparse_many
-from tools.utils import argparse_filestring_type, argparse_dir_not_parent
+from tools.utils import argparse_dir_not_parent
+from tools.utils import NoValidToolchainException
+from tools.utils import print_end_warnings
 from tools.paths import is_relative_to_root
 
-if __name__ == '__main__':
+def main():
     start = time()
 
     # Parse Options
@@ -169,40 +169,37 @@
     failures = []
     successes = []
     skipped = []
+    end_warnings = []
 
-    toolchain_names = set()
     for toolchain in toolchains:
         for target_name in targets:
             target = Target.get_target(target_name)
-            toolchain_names.add(get_toolchain_name(target, toolchain))
 
-    for toolchain_name in toolchain_names:
-        if not TOOLCHAIN_CLASSES[toolchain_name].check_executable():
-            search_path = TOOLCHAIN_PATHS[toolchain_name] or "No path set"
-            args_error(parser, "Could not find executable for %s.\n"
-                               "Currently set search path: %s"
-                       % (toolchain_name, search_path))
+            try:
+                toolchain_name, internal_tc_name, end_warnings = find_valid_toolchain(
+                    target, toolchain
+                )
+            except NoValidToolchainException as e:
+                print_end_warnings(e.end_warnings)
+                args_error(parser, str(e))
 
-    for toolchain in toolchains:
-        for target in targets:
-            tt_id = "%s::%s" % (toolchain, target)
-            if toolchain not in TARGET_MAP[target].supported_toolchains:
+            tt_id = "%s::%s" % (internal_tc_name, target_name)
+            if not target_supports_toolchain(target, toolchain):
                 # Log this later
                 print("%s skipped: toolchain not supported" % tt_id)
                 skipped.append(tt_id)
             else:
                 try:
                     notifier = TerminalNotifier(options.verbose, options.silent)
-                    mcu = TARGET_MAP[target]
-                    profile = extract_profile(parser, options, toolchain)
+                    profile = extract_profile(parser, options, internal_tc_name)
 
-                    if mcu.is_PSA_secure_target and \
+                    if target.is_PSA_secure_target and \
                             not is_relative_to_root(options.source_dir):
                         options.source_dir = ROOT
 
                     if options.source_dir:
                         lib_build_res = build_library(
-                            options.source_dir, options.build_dir, mcu, toolchain,
+                            options.source_dir, options.build_dir, target, toolchain_name,
                             jobs=options.jobs,
                             clean=options.clean,
                             archive=(not options.no_archive),
@@ -214,7 +211,7 @@
                         )
                     else:
                         lib_build_res = build_mbed_libs(
-                            mcu, toolchain,
+                            target, toolchain_name,
                             jobs=options.jobs,
                             clean=options.clean,
                             macros=options.macros,
@@ -225,7 +222,7 @@
 
                     for lib_id in libraries:
                         build_lib(
-                            lib_id, mcu, toolchain,
+                            lib_id, target, toolchain_name,
                             clean=options.clean,
                             macros=options.macros,
                             jobs=options.jobs,
@@ -236,10 +233,15 @@
                         successes.append(tt_id)
                     else:
                         skipped.append(tt_id)
+                except KeyboardInterrupt as e:
+                    print("\n[CTRL+c] exit")
+                    print_end_warnings(end_warnings)
+                    sys.exit(0)
                 except Exception as e:
                     if options.verbose:
                         import traceback
                         traceback.print_exc(file=sys.stdout)
+                        print_end_warnings(end_warnings)
                         sys.exit(1)
                     failures.append(tt_id)
                     print(e)
@@ -254,5 +256,10 @@
         if report:
             print(print_build_results(report, report_name))
 
+    print_end_warnings(end_warnings)
     if failures:
         sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()