Support Mbed CLI 2 #88
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LDong-Arm
commented
Feb 25, 2021
Comment on lines
-112
to
-116
| global TC_DICT | ||
| if not TOOLCHAIN_CLASSES[TC_DICT.get(tc)].check_executable(): | ||
| msg = "Toolchain %s was not found in PATH" % tc | ||
| raise Exception(msg) | ||
|
|
There was a problem hiding this comment.
We are removing the toolchain check, because this PR changes "ARMC6" to "ARM" as required by mbed-tools, but check_executable() still assumes "ARM" to be Arm Compiler 5 (armcc instead of armclang).
@ARMmbed/mbed-b-tools Is there a plan to update check_executable()? Or is it for the legacy tools only?
There was a problem hiding this comment.
LDong-Arm
force-pushed
the
cmake_support
branch
3 times, most recently
from
83bfb73 to
ddfefa8
Compare
This commit
* adds `CMakeLists.txt` to support Mbed CLI 2
* adds an option `--cli=[1|2]` to `test_psa_target.py` to select the
Mbed CLI version
* updates `README.md` to document this
Mbed CLI 2 is the default build tool.
Note: In the scripts, the Arm toolchain name has been changed from
`ARMC6` to ARM because `mbed-tools` (Mbed CLI 2) does not recognize
`-t ARMC6`. However, the legacy toolchain script from Mbed OS
TOOLCHAIN_CLASSES["ARM"].check_executable()
still assumes "ARM" to be Arm Compiler 5 and reports a failure,
so we have to remove the check from our script, and rely on the TF-M
and Mbed OS build systems to do the check.
As Mbed CLI 2 + CMake is supported now, this PR switches Travis to test Mbed CLI 2 only. This aligns with all Mbed official examples.
LDong-Arm
force-pushed
the
cmake_support
branch
5 times, most recently
from
d99da0a to
7befa8e
Compare
|
Sorry for the force pushes. Now both Travis and CircleCI are building. This PR is ready for review. |
|
@hugueskamba or @0xc0170 Could one of you review the cmake additions? Thanks |
To use Mbed CLI 2, the python package `mbed-tools` is required, and the version of CMake needs to be at least 3.19 so we fetch the latest from the offical PPA.
|
I've just added a commit to update Vagrant scripts to support Mbed CLI 2. |
|
Merging this as the post binary hook has been merged to Mbed OS |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR
CMakeLists.txtto support Mbed CLI 2--cli=[1|2]totest_psa_target.pyto select the Mbed CLI version (defaults to 2 if unspecified)README.mdto document the use of Mbed CLI 2Note: This PR is able to compile on its own. To be able to run it on an actual target, your check-out of mbed-os needs to have ARMmbed/mbed-os#14361.