Skip to content
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.

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

Update PSOC6 postbuild prints #9892

Merged
merged 1 commit into from Mar 1, 2019

Conversation

Projects
None yet
6 participants
@orenc17
Copy link
Contributor

commented Feb 28, 2019

Description

  • Change the way a PSA target is detected
  • Print a full path of the m0 image we are hooking with

Pull request type

[ ] Fix
[X] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

Release Notes

@ciarmcom ciarmcom requested review from ARMmbed/mbed-os-maintainers Feb 28, 2019

@ciarmcom

This comment has been minimized.

Copy link
Member

commented Feb 28, 2019

@orenc17, thank you for your changes.
@ARMmbed/mbed-os-tools @ARMmbed/mbed-os-maintainers please review.

@cmonr

cmonr approved these changes Feb 28, 2019

m0hexf = next((f for f in hex_files if os.path.basename(f) == os.path.basename(hexf)), m0hexf)

if m0hexf:
toolchain.notify.debug("M0 core image file found: %s." % os.path.basename(m0hexf))
toolchain.notify.info("M0 core image file found: %s." % m0hexf)

This comment has been minimized.

Copy link
@cmonr

cmonr Feb 28, 2019

Contributor

Any particular reason for 'debug' -> 'info'?

This comment has been minimized.

Copy link
@orenc17

orenc17 Feb 28, 2019

Author Contributor

It is critical for the user to know which m0 image is merged with the application
Info always prints the message, debug only in verbose mode

This comment has been minimized.

Copy link
@cmonr

cmonr Feb 28, 2019

Contributor

Sweet. That's what I figured.

@cmonr

This comment has been minimized.

Copy link
Contributor

commented Feb 28, 2019

CI started

@mbed-ci

This comment has been minimized.

Copy link

commented Mar 1, 2019

Test run: SUCCESS

Summary: 13 of 13 test jobs passed
Build number : 1
Build artifacts

@cmonr cmonr added ready for merge and removed needs: CI labels Mar 1, 2019

@@ -120,13 +120,13 @@ def find_cm0_image(toolchain, resources, elf, hexf, hex_filename):
from tools.resources import FileType
hex_files = resources.get_file_paths(FileType.HEX)
m0hexf = next((f for f in hex_files if os.path.basename(f) == hex_filename), None)
if toolchain.target.name.endswith('_PSA'):
if toolchain.target.is_PSA_non_secure_target:

This comment has been minimized.

Copy link
@cmonr

cmonr Mar 1, 2019

Contributor

Making sure before the big green button is pressed.

https://github.com/ARMmbed/mbed-os/blob/master/targets/targets.json#L8043

The only current valid target for this is the FUTURE_SEQUANA_PSA correct? Not FUTURE_SEQUANA_M0_PSA?

This comment has been minimized.

Copy link
@vmedcy

vmedcy Mar 1, 2019

Contributor

find_cm0_image is only executed for M4 targets (those with hex_filename set in targets.json). Therefore, toolchain.target.name.endswith('_PSA') is true only for FUTURE_SEQUANA_PSA, hence this change is safe.

@0xc0170

This comment has been minimized.

Copy link
Member

commented Mar 1, 2019

@0xc0170 0xc0170 merged commit 7ed16fb into ARMmbed:master Mar 1, 2019

28 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/build-ARMC5 Success
Details
jenkins-ci/build-ARMC6 Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR8 Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/dynamic-memory-usage RTOS ROM(+0 bytes) RAM(+0 bytes)
Details
jenkins-ci/exporter Success
Details
jenkins-ci/greentea-test Success
Details
jenkins-ci/mbed2-build-ARMC5 Success
Details
jenkins-ci/mbed2-build-ARMC6 Success
Details
jenkins-ci/mbed2-build-GCC_ARM Success
Details
jenkins-ci/mbed2-build-IAR8 Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Local astyle testing has passed
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/doxy-spellcheck Local doxy-spellcheck testing has passed
Details
travis-ci/events Passed, runtime is 9148 cycles
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/include_check Local include_check testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8408B (+0.00%)
Details
travis-ci/psa-autogen Local psa-autogen testing has passed
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
travis-ci/tools-py3.5 Local tools-py3.5 testing has passed
Details
travis-ci/tools-py3.6 Local tools-py3.6 testing has passed
Details
travis-ci/tools-py3.7 Local tools-py3.7 testing has passed
Details

@0xc0170 0xc0170 removed the ready for merge label Mar 1, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.