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.

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

Jump to bottom

modules: avoid fetching external repo in TF-M #83360

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

modules: avoid fetching external repo in TF-M #83360

wants to merge 2 commits into from
+14 −3

Conversation

wearyzen
Copy link
Collaborator

What is changed?

  • Use the updated TF-M that is compatible with the Zephyr's latest Ethos-U driver repo.
  • Change the default behavior of TF-M builds to use Ethos driver locally fetched by Zephyr, using west update, instead of downloading it from external repo.
  • revert boards: mps3_corstone300_fvp_ns: disable twister #81655 since TF-M won't fetch code from external Ethos repo

Why is this change required?

  • This is to be inline with Zephyr's rules to not fetch code from external repo.

Fixes #81656

@zephyrbot
Copy link
Collaborator

zephyrbot commented Dec 24, 2024 •
edited
Loading

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@fa020a8 zephyrproject-rtos/trusted-firmware-m@3fb1f9e (main) zephyrproject-rtos/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@wearyzen wearyzen mentioned this pull request Dec 24, 2024
Merged
@ithinuel ithinuel requested review from tomi-font and nordicjm January 6, 2025 11:12
tomi-font
tomi-font reviewed Jan 7, 2025
View reviewed changes
Copy link
Collaborator

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

Looks good; pending changes in the TF-M PR.

modules/trusted-firmware-m/Kconfig.tfm Outdated Show resolved Hide resolved
modules/trusted-firmware-m/Kconfig.tfm Outdated Show resolved Hide resolved
@wearyzen wearyzen marked this pull request as ready for review January 8, 2025 12:57
@zephyrbot zephyrbot added area: TF-M ARM Trusted Firmware-M (TF-M) platform: ARM Arm Limited labels Jan 8, 2025
@kartben
Copy link
Collaborator

kartben commented Jan 11, 2025

I would suggest keeping the revert commit as an actual, separate, revert commit to make it obvious in the history.

@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Jan 15, 2025
tomi-font
tomi-font reviewed Jan 15, 2025
View reviewed changes
Copy link
Collaborator

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

Also, you could add some context in the revert commit message (give some brief explanation/link to issue).

wearyzen added a commit to wearyzen/zephyr that referenced this pull request Jan 15, 2025
@wearyzen
Revert "boards: mps3_corstone300_fvp_ns: disable twister"
9786feb 
What is changed?
 - This reverts commit 1c596b8.

Why is this change needed?
 - This commit was added as a temporary fix for zephyrproject-rtos#81656.
   Since the previous commit (part of zephyrproject-rtos#83360) fixes the issue,
   we don't need this anymore.

Signed-off-by: Sudan Landge <[email protected]>
@wearyzen wearyzen requested a review from tomi-font January 15, 2025 12:16
tomi-font
tomi-font reviewed Jan 15, 2025
View reviewed changes
modules/trusted-firmware-m/Kconfig.tfm Outdated Show resolved Hide resolved
modules/trusted-firmware-m/Kconfig.tfm Outdated Show resolved Hide resolved
modules/trusted-firmware-m/Kconfig.tfm Outdated Show resolved Hide resolved
wearyzen added a commit to wearyzen/zephyr that referenced this pull request Jan 15, 2025
@wearyzen
Revert "boards: mps3_corstone300_fvp_ns: disable twister"
d0f5949 
What is changed?
 - This reverts commit 1c596b8.

Why is this change needed?
 - This commit was added as a temporary fix for zephyrproject-rtos#81656.
   Since the previous commit (part of zephyrproject-rtos#83360) fixes the issue,
   we don't need this anymore.

Signed-off-by: Sudan Landge <[email protected]>
@wearyzen wearyzen marked this pull request as draft January 15, 2025 15:14
wearyzen added a commit to wearyzen/zephyr that referenced this pull request Jan 15, 2025
@wearyzen
Revert "boards: mps3_corstone300_fvp_ns: disable twister"
8464a68 
What is changed?
 - This reverts commit 1c596b8.

Why is this change needed?
 - This commit was added as a temporary fix for zephyrproject-rtos#81656.
   Since the previous commit (part of zephyrproject-rtos#83360) fixes the issue,
   we don't need this anymore.

Signed-off-by: Sudan Landge <[email protected]>
@wearyzen wearyzen marked this pull request as ready for review January 15, 2025 18:06
@wearyzen wearyzen requested a review from tomi-font January 15, 2025 18:12
tomi-font
tomi-font reviewed Jan 16, 2025
View reviewed changes
Copy link
Collaborator

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

Looking mostly good! Just a few minor remarks left.

modules/trusted-firmware-m/CMakeLists.txt Outdated Show resolved Hide resolved
modules/trusted-firmware-m/Kconfig.tfm Outdated Show resolved Hide resolved
modules/trusted-firmware-m/Kconfig.tfm Outdated Show resolved Hide resolved
wearyzen added a commit to wearyzen/zephyr that referenced this pull request Jan 16, 2025
@wearyzen
Revert "boards: mps3_corstone300_fvp_ns: disable twister"
b605448 
What is changed?
 - This reverts commit 1c596b8.

Why is this change needed?
 - This commit was added as a temporary fix for zephyrproject-rtos#81656.
   Since the previous commit (part of zephyrproject-rtos#83360) fixes the issue,
   we don't need this anymore.

Signed-off-by: Sudan Landge <[email protected]>
@wearyzen wearyzen requested a review from tomi-font January 16, 2025 13:45
tomi-font
tomi-font previously approved these changes Jan 17, 2025
View reviewed changes
Copy link
Collaborator

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

Great!

modules/trusted-firmware-m/Kconfig.tfm Outdated Show resolved Hide resolved
valeriosetti
valeriosetti previously approved these changes Jan 17, 2025
View reviewed changes
kartben
kartben previously approved these changes Jan 17, 2025
View reviewed changes
@wearyzen
modules: avoid fetching external repo in TF-M
8c0f020 
What is changed?
 - Use the updated TF-M that is compatible with the Zephyr's
   latest Ethos-U driver repo.
 - Change the default behavior of TF-M builds to use Ethos driver
   locally fetched by Zephyr, using west update, instead of
   downloading it from external repo.

Why is this change required?
 - This is to be inline with Zephyr's rules to not fetch code from
   external repo.

Fixes zephyrproject-rtos#81656

Signed-off-by: Sudan Landge <[email protected]>
@wearyzen
Revert "boards: mps3_corstone300_fvp_ns: disable twister"
6db6bc7 
What is changed?
 - This reverts commit 1c596b8.

Why is this change needed?
 - This commit was added as a temporary fix for zephyrproject-rtos#81656.
   Since the previous commit (part of zephyrproject-rtos#83360) fixes the issue,
   we don't need this anymore.

Signed-off-by: Sudan Landge <[email protected]>
@wearyzen wearyzen dismissed stale reviews from kartben, valeriosetti, and tomi-font via 6db6bc7 January 17, 2025 10:52
@wearyzen wearyzen requested a review from kartben January 17, 2025 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomi-font tomi-font tomi-font approved these changes

@valeriosetti valeriosetti valeriosetti approved these changes

@nordicjm nordicjm Awaiting requested review from nordicjm

@d3zd3z d3zd3z Awaiting requested review from d3zd3z

@ithinuel ithinuel Awaiting requested review from ithinuel

@Vge0rge Vge0rge Awaiting requested review from Vge0rge

@kartben kartben Awaiting requested review from kartben

Assignees

@d3zd3z d3zd3z

Labels
area: TF-M ARM Trusted Firmware-M (TF-M) manifest manifest-hal_ethos_u manifest-trusted-firmware-m platform: ARM Arm Limited
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

board mps3_corstone300_fvp_ns fetching code from external repositories and failing in CI
6 participants
@wearyzen @zephyrbot @kartben @valeriosetti @tomi-font @d3zd3z