Skip to content

Fix detection of supported targets for mbed 2 builds #10347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 10, 2019
Merged

Fix detection of supported targets for mbed 2 builds #10347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a2836f
Fix detection of supported targets for mbed 2 builds
bridadan Apr 8, 2019
11775ef
Force SAMD21 and SAMR21 targets to ARMC5 due to incompatibility.
bridadan Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6646,7 +6646,7 @@
"TC_ASYNC=true"
],
"extra_labels": ["Atmel", "SAM_CortexM0P", "SAMR21"],
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
"supported_toolchains": ["GCC_ARM", "ARMC5", "uARM"],
"device_has": [
"ANALOGIN",
"I2C",
Expand Down Expand Up @@ -6679,7 +6679,7 @@
"TC_ASYNC=true"
],
"extra_labels": ["Atmel", "SAM_CortexM0P", "SAMD21"],
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
"supported_toolchains": ["GCC_ARM", "ARMC5", "uARM"],
"device_has": [
"ANALOGIN",
"ANALOGOUT",
Expand Down Expand Up @@ -6713,7 +6713,7 @@
"TC_ASYNC=true"
],
"extra_labels": ["Atmel", "SAM_CortexM0P", "SAMD21"],
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
"supported_toolchains": ["GCC_ARM", "ARMC5", "uARM"],
"device_has": [
"ANALOGIN",
"ANALOGOUT",
Expand Down Expand Up @@ -6747,7 +6747,7 @@
"TC_ASYNC=true"
],
"extra_labels": ["Atmel", "SAM_CortexM0P", "SAML21"],
"supported_toolchains": ["GCC_ARM", "ARM", "uARM"],
"supported_toolchains": ["GCC_ARM", "ARMC5", "uARM"],
"device_has": [
"ANALOGIN",
"ANALOGOUT",
Expand Down
4 changes: 1 addition & 3 deletions tools/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,8 @@ def main():
except NoValidToolchainException as e:
print_end_warnings(e.end_warnings)
args_error(parser, str(e))

tt_id = "%s::%s" % (internal_tc_name, target_name)
if not target_supports_toolchain(target, toolchain):
if not target_supports_toolchain(target, toolchain_name):
# Log this later
print("%s skipped: toolchain not supported" % tt_id)
skipped.append(tt_id)
Expand All @@ -196,7 +195,6 @@ def main():
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, target, toolchain_name,
Expand Down
9 changes: 5 additions & 4 deletions tools/build_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,6 @@ def build_mbed_libs(target, toolchain_name, clean=False, macros=None,
#then set the default_toolchain to uARM to link AC6 microlib.
if(selected_toolchain_name == "ARMC6" and toolchain_name == "uARM"):
target.default_toolchain = "uARM"
toolchain_name = selected_toolchain_name

if report is not None:
start = time()
Expand All @@ -1003,7 +1002,7 @@ def build_mbed_libs(target, toolchain_name, clean=False, macros=None,
prep_properties(
properties, target.name, toolchain_name, vendor_label)

if toolchain_name not in target.supported_toolchains:
if not target_supports_toolchain(target, toolchain_name):
supported_toolchains_text = ", ".join(target.supported_toolchains)
notify.info('The target {} does not support the toolchain {}'.format(
target.name,
Expand All @@ -1023,14 +1022,16 @@ def build_mbed_libs(target, toolchain_name, clean=False, macros=None,

try:
# Source and Build Paths

build_toolchain = join(
MBED_LIBRARIES, mbed2_obj_path(target.name, toolchain_name))
MBED_LIBRARIES, mbed2_obj_path(target.name, selected_toolchain_name)
)
mkdir(build_toolchain)

tmp_path = join(
MBED_LIBRARIES,
'.temp',
mbed2_obj_path(target.name, toolchain_name)
mbed2_obj_path(target.name, selected_toolchain_name)
)
mkdir(tmp_path)

Expand Down