Skip to content

Conversation

@oyvindronningstad
Copy link
Contributor

@oyvindronningstad oyvindronningstad commented Dec 10, 2020

Reintroduce #30050, reverted in #30610

Note that because of #30616, this now correctly runs the doc build, which passes with the addition of the west update line.

Moved west.yml entry from module to zephyr's west.yml

@github-actions
Copy link

github-actions bot commented Dec 10, 2020

The following projects have a revision update in this Pull Request:

Name Old Revision New Revision
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@4544ab9 zephyrproject-rtos/trusted-firmware-m@dcfa70e (master)

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

@oyvindronningstad oyvindronningstad changed the title Fix doc build Reintroduce tfm-mcuboot Dec 10, 2020
west.yml Outdated
Copy link
Contributor

@tejlmand tejlmand Dec 14, 2020

Choose a reason for hiding this comment

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

We should not import from Zephyr modules from Zephyr manifest.
Please revert to the code you initially had when using Zephyr mcuboot, like you had here:
b34978f

    - name: tfm-mcuboot
      path: modules/tee/tfm/mcuboot
      repo-path: mcuboot
      revision: 1.7.0-rc1

Copy link
Member

@carlescufi carlescufi left a comment

Choose a reason for hiding this comment

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

As mentioned in Slack, I also agree with @tejlmand. We agreed that zephyr-specific changes and glue should stay in the main zephyr tree, and this is very much that in my opinion.

@ioannisg ioannisg requested a review from tejlmand December 14, 2020 14:18
@github-actions github-actions bot added the DNM This PR should not be merged (Do Not Merge) label Dec 14, 2020
Turn on import, so tfm's west.yml is processed.

Signed-off-by: Øyvind Rønningstad <[email protected]>
@oyvindronningstad
Copy link
Contributor Author

Added comment, updated sha, and changed from url to repo-path

@github-actions github-actions bot removed the DNM This PR should not be merged (Do Not Merge) label Dec 14, 2020
@carlescufi
Copy link
Member

@galak are you OK with this?

@ioannisg ioannisg requested a review from galak December 14, 2020 18:35
@carlescufi carlescufi merged commit 0cb6c40 into zephyrproject-rtos:master Dec 15, 2020
@oyvindronningstad oyvindronningstad deleted the tfm-mcuboot branch June 22, 2021 06:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants