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

Tfm devictree pin config #1359

Merged
merged 10 commits into from
Oct 31, 2023
Merged

Conversation

joerchan
Copy link
Contributor

No description provided.

joerchan and others added 10 commits October 27, 2023 16:40
This reverts commit 542ff49.

This revert is only done to be able to revert another patch without
conflict.
This commit will be re-applied.

Signed-off-by: Joakim Andersson <[email protected]>
…oards"

This reverts commit aa00769.

Signed-off-by: Joakim Andersson <[email protected]>
… pins to uart1

Add the default HW flow control pins to the uart1 node.

Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit 9ac8525)
Signed-off-by: Joakim Andersson <[email protected]>
Add uart1 pinctrl assignment to nrf5340 Audio DK.
Assigned according to Schematic for this board.

Uart1 pins needed by TF-M when using the NS board variant.

Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit 32a1c89)
Signed-off-by: Joakim Andersson <[email protected]>
Add generic SoC support for the supported nordic SoCs:
- nrf5340
- nrf9160
- nrf9120

Add generic SoC support by taking board specific configurations from
zephyr devicetree and kconfig.

Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit 33a44d0)
Signed-off-by: Joakim Andersson <[email protected]>
Enable TF-M by default for nordic nRF5340 and nrf9160 SoC boards.

Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit 17fd1f8)
Signed-off-by: Joakim Andersson <[email protected]>
All nRF91 and nRF5340 boards (except the DKs) should support TF-M/_ns
now.

Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit 142dd9f)
Signed-off-by: Joakim Andersson <[email protected]>
Fix secure and non-secure images overlapping because of incompatible
flash layout configurations.

Align the board configurations to match the nRF9160 DK default
partition layout.

This enforces that the SPU alignment requirement is satisfied for
the nrf9160 MCU.

Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit dc431a7)
Signed-off-by: Joakim Andersson <[email protected]>
…th TFM silent conf

Add choice for BL2 log level configuration.
Silence TF-M BL2 logging when TF-M is configured to be silent.

Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit 96c5052)
Signed-off-by: Joakim Andersson <[email protected]>
Change enables MCUboot bootloader by default to allow programming
samples and applications without external programmer (using MCUboot
serial recovery). Change also enables network core to prevent build
failures when building MCUboot with nRF53 multi image DFU.

Jira: NCSDK-18263

Signed-off-by: Marek Pieta <[email protected]>
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit 4689549)
(cherry picked from commit ff1db43)
Signed-off-by: Joakim Andersson <[email protected]>
@joerchan joerchan force-pushed the tfm-devictree-pin-config branch from bbae2d3 to 00a1db8 Compare October 27, 2023 14:41
@rlubos rlubos merged commit ff85910 into nrfconnect:main Oct 31, 2023
10 checks passed
@joerchan joerchan deleted the tfm-devictree-pin-config branch October 31, 2023 13:07
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.

9 participants