Add support for nrfx 4.0 #156
Merged
Conversation
This file contains hidden or 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
Add initial tfm support for nrf7120 This is based on nrf54l series soc, should have similar settings Added startup_nrf71 and target_cfg_71 to support this Change-Id: I83d9b971c4e46fc300092fd0badd30e2023639cc Signed-off-by: Travis Lam <travis.lam@nordicsemi.no> (cherry picked from commit 10be9b4fbd2a8d8201aee7ccd5b5fb3389099c40)
…4L series Update nrf5l_init to enable DCDC during startup. LDO is not supported and therefore causes larger power consumption. Change-Id: I9a6dc928259895ed8b54c99aff9974ce1a13896e Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit 76c6c1df85238c2cfda11d16a8011cba3ea324ff)
Update the Nordic USART functions to accept other miscellaneous control commands apart from the mode control ones. This makes the USART functions for Nordic platforms to acept the CONTROL_TX and CONTROL_RX commands as well. The sdtio_init function uses the ARM_USART_CONTROL_TX command which used to fail for Nordic platforms before but the return code of the control function was never checked. Recently this changed and it now checks for the return code which makes the Nordic platform failing to boot so this change is necessary. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Change-Id: I65b0884338df924dbec3783421779d64ceaaf741 (cherry picked from commit f256c198e7ba794da5e4ac7f868c8a68ce6bad31)
Starting with nrfx 4.0 nrfx.h must now be included instead of nrf.h. Prepare for the update of nrfx by updating the includes accordingly. Change-Id: Ic92f2d954ceebc79226681114abc7e0457fc01a6 Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit b913372934c7748600ad6ae3b69cdcee8c487293)
…onfig.h Starting from nrfx 4.0 nrf.h must not be included directly and because we are in the nrfx configuration header file we cannot include nrfx.h. So remove the include and instead of using MDK defines use device-specific compile definitions that are defined by TF-M. Change-Id: I23a7ab5a0def59317db7a35419da28643bbf706e Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit cb43291fb2032ee5b8bf7c277cc93c89fe749207)
nika-nordic force-pushed the integrate_nrfx_4_0_zephyrtfm branch from 3eac1cb to 450f985 Compare This was referenced Nov 17, 2025
Align common files. Change-Id: I73509382d31476f88c20dee42fde4de6126f565d Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no> (cherry picked from commit 8ff947dd53f91cc850ee05164d9df5e377a48fbd)
…factor Align with changes needed for nrfx 4.0. Refactor to use nrfx layer instead of HAL. Change-Id: Ibbffe2c2e27ea98ac08e0e23f4c33603c04fe5ea Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no> (cherry picked from commit f07f10b9c028ee1de036037264e6b1929432af1d)
Fix a path issue with the non secure application config.cmake file. The config.cmake for nRF54L10 and nRF54L15 is the same. To avoid duplicating the file the config.cmake is placed in a common nrf54l folder and it is included by each platforms config.cmake files. This doesn't work for the non secure application because the path does not exist. To fix that install to the non secure application the common file directly. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Change-Id: I36d6bed5d1f2a71ed12f9004485accfcbca1b0d6 (cherry picked from commit 51352be)
All copyright headers updated to comply with BSD-3-Clause. Change-Id: Ie36f8039cdf5fb6f3fa768c588850d95abaf0027 Signed-off-by: Anton Zyma <anton.zyma@nordicsemi.no> (cherry picked from commit d33d42d6728172d7db69805d1c3985bd11a89455)
tomi-font force-pushed the integrate_nrfx_4_0_zephyrtfm branch from f17ad46 to e964619 Compare 
tomi-font approved these changes Nov 26, 2025
carlescufi approved these changes Nov 27, 2025
nika-nordic force-pushed the integrate_nrfx_4_0_zephyrtfm branch from e964619 to 8a93a42 Compare Updated tag to 3.12.1 Change-Id: I650d2f85e137c6d0c5af3206cc4daee66448af13 Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit dfdd45978d07bc7b44e4b7dcf3a9ea99d1295112)
Use nrfx 4.0.1 release. Change-Id: I838d1ece8bd5ba248e421334bdd6a140d5fc9a6c Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no> Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
nrfx_config from nrfx's templates can be used. Change-Id: I5f532376ef0c9c73ec19b3933685a644a35a9c19 Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no> Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Update error codes. Change-Id: I492f82cfb777a5acfac536ae5e647ed8b7a61df3 Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no> Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
… last Since `compiler_ext_defs.h` should define compiler symbols only if they have not been previously defined, it should be included as the last header to avoid redefine warnigns. Fix in all files. Change-Id: I010b8885b4e1b150ec527f0b246b95a4dab4902a Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no> Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
tomi-font force-pushed the integrate_nrfx_4_0_zephyrtfm branch from 8a93a42 to 1fd5bd2 Compare Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
8 participants
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.
Upstream PRs:
+some missingfromtreecommitsTo be pulled in by: zephyrproject-rtos/zephyr#99399