-
Notifications
You must be signed in to change notification settings - Fork 624
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
Add support for the new BICR generation tools #2298
Open
gmarull
wants to merge
33
commits into
nrfconnect:main
Choose a base branch
from
gmarull:upstream-bicr
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,687
−410
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Nov 25, 2024
gmarull
force-pushed
the
upstream-bicr
branch
from
November 28, 2024 09:47
91953c2
to
32784ac
Compare
gmarull
force-pushed
the
upstream-bicr
branch
from
November 28, 2024 10:00
32784ac
to
df90e61
Compare
gmarull
force-pushed
the
upstream-bicr
branch
3 times, most recently
from
November 28, 2024 15:09
09e272e
to
2a612bb
Compare
bjarki-andreasen
approved these changes
Nov 28, 2024
…fig" This reverts commit dab9c11. Signed-off-by: Gerard Marull-Paretas <[email protected]>
This reverts commit 1eef25b. Signed-off-by: Gerard Marull-Paretas <[email protected]>
This reverts commit 1cc6e15. Signed-off-by: Gerard Marull-Paretas <[email protected]>
Due to the possibility of simultaneous accesess to LRCCONF registers, additional management is required. Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit 9b252855fd075d39a41ba61dccea8f7a81ecb77e)
Add `idle` and `s2ram` power states for nRF54H20 cpuapp and cpurad. Also the substate `idle_cache_disable` added. Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit e786c1f8492b07beb510b2a42fb1469871b5db1f)
IRQs must be disabled before starting any procedures to prepare for low-power states. Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit be1f40547fae11ae2ca879d900640c1666e706f5)
…efault" This reverts commit 8bc628d. Signed-off-by: Gerard Marull-Paretas <[email protected]>
This reverts commit de051d6. Signed-off-by: Gerard Marull-Paretas <[email protected]>
This reverts commit 29e1f33. Signed-off-by: Gerard Marull-Paretas <[email protected]>
This reverts commit 6b48f84. Signed-off-by: Gerard Marull-Paretas <[email protected]>
…for the L05 and L10 ICs" This reverts commit 270c1e9. Signed-off-by: Gerard Marull-Paretas <[email protected]>
This reverts commit c24387f. Signed-off-by: Gerard Marull-Paretas <[email protected]>
This reverts commit 1b6cc13. Signed-off-by: Gerard Marull-Paretas <[email protected]>
Shell is capable of acting as the logging backend and multiplex logging messages with shell content. It expects that logging messages goes through the logging backend. However, there is an option that logs go only to the custom logging frontend. In that case this default approach does not work and logging frontend cannot be easily integrated with the shell (due to its custom nature). Add Kconfig option SHELL_LOG_BACKEND_OOB which prevent compilation of the default shell log backend. When enabled, application can provide frontend specific implementation to integrate shell with the logging. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 05dd68a)
Extract shell instance creation from SHELL_DEFINE to Z_SHELL_DEFINE. SHELL_DEFINE creates logging backend and calls Z_SHELL_DEFINE to create a shell instance with that logging backend. With this split it is possible to create a shell instance with logging integration but without the default shell logging backend. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 7474676)
… buffer declaration Use DMM_MEMORY_SECTION instead of a custom macro. When file was created dmm was not present yet. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit fe6c288)
Extend ETR handler to be able to work as shell backend and multiplex Coresight STM logging with shell content on the UART used by the ETR handler. Shell backend works only in the standalone mode. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 7ea87f4)
…en ETR is used ETR handler (for Coresight STM logging) is using console UART and can act as the shell backend. When that happens default serial shell backend shall be disabled (and it is by default enabled if there is a zephyr,console chosen set. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 6253c06)
…the logging frontend When shell is integrated with the logging frontend then pointer to the logging backend in the shell structure is null. When null pointer is found assume that it is a shell instance with logging frontend integration and use frontend in the logging commands. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 60d8482)
The production version of the nRF54H20 SoC is now available, so remove the initial Engineering B (EngB) preview version. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 9643ca20e9bc8df28c02aac923c3a794bbef6f5f)
…L05 and L10 ICs The nRF54L05 and nRF54L10 are identical to the nRF54L15 except for their memory sizes. Add support for emulating those ICs on the nRF54L15DK. This commit only adds support for the main application core. Support for the FLPR core may be added later. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 21475774fc412fed7273408de65ee69bcdd1b84e)
This adds the nrf54l15dk/nrf54l15/cpuapp/ns board variant to sdk-zephyr. It allows to build nRF54l15dk with TF-M in nRF Connect SDK. This is done as a noup as the out-of-tree board extension feature is not available. When zephyrproject-rtos/zephyr#69548 is completed this commit can be reverted and the variant be placed in sdk-nrf. Signed-off-by: Tomi Fontanilles <[email protected]> (cherry picked from commit 6b4c840)
These two new ICs are variants of the nRF54L15 with different memory sizes: - nRF54L05: 500KB RRAM, 96KB RAM - nRF54L10: 1022KB RRAM, 192KB RAM - nRF54L15: 1524KB RRAM, 256KB RAM Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit e78832034f1ea3632524f2cbdbe290082483ddf6)
This is a long-term noup patch because crypto driver support is NCS-only for both cryptocell and CRACEN. Set HAS_HW_NRF_CC3XX to be defined in NS build when cryptocell is accessed through the PSA API. We need to know which CC3XX features are available. Set PSA as the entropy source for 54L. PSA is the only NCS-supported interface to CRACEN. Signed-off-by: Georgios Vasilakis <[email protected]> Signed-off-by: Joakim Andersson <[email protected]> Signed-off-by: Dominik Ermel <[email protected]> Signed-off-by: Sebastian Bøe <[email protected]> Signed-off-by: Robert Lubos <[email protected]> Signed-off-by: Rubin Gerritsen <[email protected]> (cherry picked from commit d643f17)
The SoftDevice Controller is a different controller than the open source link layer with a different set of quirks. It should therefore have its own device tree binding. This commit converts the SoftDevice Controller driver to use this new DTS binding instead of reusing the existing one. This commit updates or adds additional overlays for existing samples, applications and tests that were using the open source link layer. Signed-off-by: Rubin Gerritsen <[email protected]> (cherry picked from commit 8d6a853)
Add binding for the Nordic nRF BICR memory. Upstream PR #: 81122 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 83938e65cba6842c253c1b7741d33d669548bdf4)
BICR (Board Information Configuration Registers) are located within the application UICR region (ref. MRAM mapping, table 38). Upstream PR #: 81122 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 08f6abad8ddea830b6ff4ed7ae663f3e97a0b16f)
The real, applicable and trusted values are the ones flashed into BICR. So, drop DT properties that replicate BICR and use runtime reads to BICR instead. Upstream PR #: 81122 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 74a8fcbd38aa0cc3ce48eebc0b357cc2c7c14ac6)
…obtain LFOSC acc Add a utility function to obtain LFOSC accuracy in PPM from BICR. Upstream PR #: 81122 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit af7dba707626e5a09046dcac1d626ef61086bd77)
…BICR The real, applicable and trusted values are the ones flashed into BICR. So, drop DT properties that replicate BICR and use runtime reads to BICR instead. Upstream PR #: 81122 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 1b3500e022d28d78934570b2e3112badf65b6d23)
… BICR The real, applicable and trusted values are the ones flashed into BICR. So, drop DT properties that replicate BICR and use runtime reads to BICR instead. Upstream PR #: 81122 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit a41e7e407448e731cdb3861864d89b1632b57b3d)
Add supporting scripts and build-system integration for BICR (Board Information Configuration Registers) generation. Upstream PR #: 81604 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 2c4bdd33a0b87e6d5f9c58a59fd3ca554e03366b)
bicr.json is a supporting file that, if present and CONFIG_SOC_NRF54H20_GENERATE_BICR=y (default), will be used to generate a BICR hex file. The schema for the file can be found at soc/nordic/nrf54h20/bicr/bicrgen-schema.json. Upstream PR #: 81604 Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 9b6dbda7458bc39a8900b43d12c237062e834f7d)
gmarull
force-pushed
the
upstream-bicr
branch
from
November 29, 2024 09:10
2a612bb
to
1ad597c
Compare
adamkondraciuk
approved these changes
Nov 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
BICR generation happens now using a new tool integrated in upstream Zephyr