(Zephyr 3.7) update to 2.1.4 #162
Open
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
All drivers required by lpcxpresso55s69 are placed in platform/common folder of NXP, copied from sdk 25.09.00. Instead of fetching drivers at run time, all required drivers are placed in platform or common directory. This is to re-use the drivers by upcoming platforms as well as keep using same drivers during zephyr builds. Change-Id: I5500dad96ebbe5d000d140a5bab25349ce36cc5f Signed-off-by: Waqar Tahir <waqar.tahir@nxp.com> (cherry picked from commit 0b704878e8a30559d0e13c5e7bb1e8bab0787d6d)
In Zephyr we get a build failure on this platform because of the unused-function warning. Declare the affected functions as `static inline` so the compiler doesn't complain if they are unused. Change-Id: Id80e10264284bd5ffec55fc188e2969964a3506f Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit 4910af3cf74396124fceb7172a8573258fb91126)
…common Move all the partition folders in common folder so that they can be used by Zephyr when it builds with TF-M. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Change-Id: I1a6910437162ea1e082747c04c100ca3a8a60ba1 (cherry picked from commit 6a67c63) Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
tomi-font requested review from Vge0rge, d3zd3z, ithinuel, valeriosetti and wearyzen … default value If NRF_SECURE_UART_INSTANCE is not defined (which it is only in NCS), bring back the default behavior of assigning Driver_USART1 to TFM_DRIVER_STDIO. This fixes the issue of undefined references to Driver_USART0 in non-NCS environments that was introduced by commit 2ed1f3f/ Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> Change-Id: I0b51a957ffc41c593b4cecd21a72b801ef90f656 (cherry picked from commit 66dc44b) Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
…ED_TFM_TESTS_VERSION Fix a typo. Change-Id: Iccfe6dd0bc0c344eb4fdc8e6c780cdb35433b5b8 Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit f38236c)
…ecks Introduce the CMake variable TFM_TESTS_REVISION_CHECKS to allow not performing the revision checks in the tf-m-tests repo. This is needed for TF-M forks where the upstream tags are not found, which makes the build fail. Change-Id: I10371841925f9fb811f0d47a2e0dc2c9e8e7cfac Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit 17e9e9c) Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Fix "unused variable" compilation warning. Change-Id: I460c4d612184ea57e47ee8da050495435c21912d Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit ca9be3b)
Use generic assert for NRFX_ASSERT since SPM_ASSERT can either expand to secure-fw specific or generic assert. Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com> Change-Id: If42d18798e7b4e9e3cd03bac42ec70f0faefca04 (cherry picked from commit 37d49d2)
Replace SPM_ASSERT with assert. The behaviour is unchanged when the build is for secure-fw runtime cause assert is expanded to SPM_ASSERT. Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com> Change-Id: If6815016f3c4d38031c2f76b4bcd8cd683447ab7 (cherry picked from commit 48ef350)
Replace SPM_ASSERT with assert. The behaviour is unchanged when the build is for secure-fw runtime cause assert is expanded to SPM_ASSERT. Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com> Change-Id: I6f72bad0a9e8fd32f8650f25da865d66dd8c689d (cherry picked from commit 309232e)
…not found In the case of Zephyr's integration of TF-M, the Git tags of the upstream TF-M repo are not fetched. This resulted in this warning firing up at every build for every user while in fact it does not require any action from the user, and is just noise. Thus remove it. Change-Id: I9fc78ff89e978a0622e80d59dadc8dcfeeb7e553 Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> (cherry picked from commit b6c19b7)
The option MCUBOOT_DIRECT_XIP_REVERT can be an enabled only when XIP upgrade mechanism is enabled in MCUBOOT. The MCUBOOT default configuration in Cmake does't select XIP as the default upgrade option and thus it should not enable XIP_REVERT. This updates the default cmake config to disable XIP_REVERT. It also adds a Kconfig dependency for this option and it adds a cmake configuration check for this as well. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Change-Id: I8e4844ab70d927836a890ca8123b734a471f3270 (cherry picked from commit 32ffe3f)
…lash_layout.h flash_layout.h uses the definition of MCUBOOT_OVERWRITE_ONLY to enforce this strategy, and then expects it to undefine it for MCUBOOT_UPGRADE_STRATEGY contents to have effect. This might work but it is confusing, hence align the two. Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com> Change-Id: I75b62b433536a81d973ac45c212201d12dd38e07 (cherry picked from commit c140d6e)
This forces DWARF version 4 output so that zephyr debugging and usage still works with the pyelftools library which does not currently support v5. see zephyrproject-rtos/zephyr#50373 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Avoids including `t_cose` and `qcbor` in the build unless the initial attestation secure partition is enabled via the `TFM_PARTITION_INITIAL_ATTESTATION` flag. This is required to avoid automatically downloading QCBOR at build time -- pulled in as a dependency of t_cose -- unless required. This commit should be reverted once an acceptable upstream solution has been found for this situation, and merged there. Signed-off-by: Kevin Townsend <kevin.townsend@linaro.org>
This adds all the files (minus `.git*` and `CMSIS/Documentation/` for saving on size) from the CMSIS v6 repository (https://github.com/ARM-software/CMSIS_6) at the revision `d0c460c169` as defined in `lib/ext/cmsis/CMakeLists.txt`. The patch `lib/ext/cmsis/0001-iar-Add-missing-v8.1m-check` is applied on top. This is because as of v2.1.0 TF-M has updated to CMSIS v6 and switched from hosting the sources to depending on the upstream repository, cloning it at build time. To prevent a download from happening during the build, CMSIS v6 sources are pushed and the CMSIS_PATH CMake variable is used to point to them. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
Add zephyr module file to to include CMakeLists.txt and Kconfig located in the zephyr repository. Originally included in: 69dc29a but this will change the root folder of the module. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
Add CPE and PURL references for use by Zephyr's SPDX generation tool. Signed-off-by: Matt Rodgers <mrodgers@witekio.com> Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
tomi-font force-pushed the bump_to_2.1.4 branch from ebf652c to 2e1d721 Compare 
valeriosetti approved these changes Dec 16, 2025
wearyzen approved these changes Dec 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
10 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.
No description provided.