Skip to content

Update PSOC6 postbuild prints #9892

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 1 commit into from
Mar 1, 2019
Merged

Update PSOC6 postbuild prints #9892

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions tools/targets/PSOC6.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Copy link
Contributor

@cmonr cmonr Mar 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sweet. That's what I figured.

else:
toolchain.notify.debug("M0 core hex image file %s not found. Aborting." % hex_filename)
toolchain.notify.info("M0 core hex image file %s not found. Aborting." % hex_filename)
raise ConfigException("Required M0 core hex image not found.")

return m0hexf
Expand Down