Build metadata check added

targets/targets.json

@@ -8280,5 +8280,9 @@
 		"detect_code": ["8013"],
 		"release_versions": ["5"],
 		"bootloader_supported": true
+    },
+    "__build_tools_metadata__": {
+        "version": "1",
+        "public": false
     }
 }

tools/build_api.py

@@ -122,7 +122,7 @@ def add_result_to_report(report, result):
     report[target][toolchain][id_name].append(result_wrap)
 
 def get_toolchain_name(target, toolchain_name):
-
+    if int(target.build_tools_metadata["version"]) > 0:
         if toolchain_name == "ARM" or toolchain_name == "ARMC6" :
             if("ARM" in target.supported_toolchains or "ARMC6" in target.supported_toolchains):
                 return "ARMC6"
@@ -137,6 +137,12 @@ def get_toolchain_name(target, toolchain_name):
             else:
                 target.default_toolchain = "uARM"
                 return "ARMC6" #use AC6+microlib
+    else:
+        if toolchain_name == "ARM":
+            if CORE_ARCH[target.core] == 8:
+                return "ARMC6"
+            elif getattr(target, "default_toolchain", None) == "uARM":
+                return "uARM"
 
     return toolchain_name
 
@@ -295,6 +301,7 @@ def get_mbed_official_release(version):
     return mbed_official_release
 
 def target_supports_toolchain(target, toolchain_name):
+    if int(target.build_tools_metadata["version"]) > 0:
         if toolchain_name in target.supported_toolchains:
             return True
         else:
@@ -304,8 +311,13 @@ def target_supports_toolchain(target, toolchain_name):
             if(toolchain_name == "ARMC6"):
                 #we did not find ARMC6, but check for ARM is listed
                 return any(tc in target.supported_toolchains for tc in ("ARM",))
-            
         return False
+    else:
+        ARM_COMPILERS = ("ARM", "ARMC6", "uARM")
+        if toolchain_name in ARM_COMPILERS:
+            return any(tc in target.supported_toolchains for tc in ARM_COMPILERS)
+        else:
+            return toolchain_name in target.supported_toolchains
 
 def prepare_toolchain(src_paths, build_dir, target, toolchain_name,
                       macros=None, clean=False, jobs=1,

tools/targets/__init__.py

@@ -103,6 +103,7 @@ def cached(func):
 # need to be computed differently than regular attributes
 CUMULATIVE_ATTRIBUTES = ['extra_labels', 'macros', 'device_has', 'features', 'components']
 
+default_build_tools_metadata = {u'version':0, u'public':False}
 
 def get_resolution_order(json_data, target_name, order, level=0):
     """ Return the order in which target descriptions are searched for
@@ -125,6 +126,9 @@ def get_resolution_order(json_data, target_name, order, level=0):
 
 def target(name, json_data):
     """Construct a target object"""
+    if name.startswith("_"):
+        raise Exception("Invalid target name '%s' specified, target name should not start with '_'" % name)
+    
     try:
         resolution_order = get_resolution_order(json_data, name, [])
     except KeyError as exc:
@@ -132,11 +136,13 @@ def target(name, json_data):
             "target {} has an incomplete target definition".format(name)
         ), exc)
     resolution_order_names = [tgt for tgt, _ in resolution_order]
+    
     return Target(name=name,
                   json_data={key: value for key, value in json_data.items()
                              if key in resolution_order_names},
                   resolution_order=resolution_order,
-                  resolution_order_names=resolution_order_names)
+                  resolution_order_names=resolution_order_names,
+                  build_tools_metadata=json_data.get("__build_tools_metadata__", default_build_tools_metadata))
 
 def generate_py_target(new_targets, name):
     """Add one or more new target(s) represented as a Python dictionary
@@ -151,9 +157,10 @@ def generate_py_target(new_targets, name):
     total_data = {}
     total_data.update(new_targets)
     total_data.update(base_targets)
+    
     return target(name, total_data)
 
-class Target(namedtuple("Target", "name json_data resolution_order resolution_order_names")):
+class Target(namedtuple("Target", "name json_data resolution_order resolution_order_names build_tools_metadata")):
     """An object to represent a Target (MCU/Board)"""
     
     # Default location of the 'targets.json' file