Cherry-pick and noup required commits to support nRF54LM20A/ns #150
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
degjorva changed the title 
tomi-font approved these changes Oct 10, 2025
tomi-font changed the title tomi-font approved these changes Oct 13, 2025
degjorva force-pushed the lm20-tfm-cherrypick branch from b22e5fb to c1826d6 Compare tomi-font approved these changes Oct 13, 2025
degjorva force-pushed the lm20-tfm-cherrypick branch from c1826d6 to ecc7d79 Compare tomi-font requested changes Oct 16, 2025
…latforms This is a noup as the original commit does not apply cleanly. Attempts to cherry-pick it in cleanly leads to a large amount of extra commits being included. Original commit message: This splits the target_cfg.c file for the different platfoms. It splits the file into two files one for the nRF54L and one for the nRF91/nRF53 series. There is no need for the peripherals to be in the same file as the configuration code. There is already a header which provides extern definitions for all the peripherals a device supports which can be used for for source files needing to configure peripherals. So this peripheral definitions are placed in a separate file. Most of the code is taken unchanged from the target_cfg.c file and the uneeded ifdefs got removed. The init_debug function got rewritten without changing the logic of it. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> Change-Id: I19071727061b8952e3abbae20dd182c822234427 (cherry picked from commit 37e8dc47d4eb4aa0c0b905f80be5272aafbd9fa2)
The secure peripherals definitions use the base address macros provided by nrfx so include the nrfx header in the file. Change-Id: Ibc6ffd4256a349d47a6ae9f163b34eac797338ad Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no> (cherry picked from commit 62afa0c382cb7c9e2367302e889ea1be8d19ee42)
Add initial support for nrf54lv10a This is based upon the existing nrf54l series of targets Update startup_nrf54l and target_cfg_54l to support this Change-Id: I0dc11ca4cb39485d29bf595dacc41c3ee6383cdd Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit a2280a58d13229f55bd4e10ef6a7fd34c389f1d0)
Add initial support for nrf54lm20a This is based upon the existing nrf54l series of targets Update startup_nrf54l and target_cfg_54l to support this Change-Id: I6b0c1a818a255263411b67278ab7fcef65063e60 Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit 94403de41cad6763f3b08cabd529da5ad748b716)
degjorva force-pushed the lm20-tfm-cherrypick branch from ecc7d79 to ea94382 Compare degjorva changed the title tomi-font reviewed Oct 20, 2025
lv10 should use uart20 as the secure uart. Update configurations to reflect this Change-Id: Ic4d5bce62fc810dc5d3f313ff1a34d456c4d5ccd Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit 01a4fa46d6b9926849da847ba2c37ed17caded43)
UART should not be force set for 54l devices. This to support user selecting which UARTs are secure. Change-Id: Ic4fffe748476b85e2e6758d92d687ec36b179e3e Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit b9ef3b259b19f69eb2a6e7b72f6f9bb03420c9c3)
Update nRF54LM20A flash layout to correctly set ns partition size. Change-Id: I66aa51d2a1be6a16d5dfcb746a5e94f1547232a8 Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit c60128e90b1a405d46f2293c6c9a9345380b4dc5)
54L series was failing to build due to two different issues. First was incorrectly selected SECURE_UART for some devices. Updated so both uart20 and uart30 can be selected. Secondly was missing SHARED_BOOT_MEASURMENT_BASE. it is not used so set to 0 for relevant devices. Change-Id: I4c72bd5300eb58fd2bf95976f9f8cb9fd4d76b41 Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit c58c975d5ffc9839ab3662f5a1d19e5daaf4ef6c)
Sset changed to set. Change-Id: Id308ce67e1d49601dda6987f2bac5db909d6554f Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit e280ac1bcaee50afa407d7b16671296b0f1e968c)
…F54LV10A/M20A This is a continuation of "Add memory service header in common folder" Adds a copy of the memory_services_range to the common folder to allow Zephyr builds. A proper solution to this is planned later to avoid the duplication. Change-Id: I303c2a24caa3149883ad4ddb592b3ba1be2a61d2 Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no> (cherry picked from commit 2f86a3d4b4d389a5e8c7abbd70541e1718453c62)
degjorva force-pushed the lm20-tfm-cherrypick branch from ea94382 to a96e689 Compare tomi-font approved these changes Oct 20, 2025
Vge0rge approved these changes Oct 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 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.
Bring in the required commits to support nRF54LM20A/ns cleanly in this PR: zephyrproject-rtos/zephyr#95743. TrustedFirmware-M/trusted-firmware-m@37e8dc4 is a noup as it does not apply cleanly
TrustedFirmware-M/trusted-firmware-m@37e8dc4
TrustedFirmware-M/trusted-firmware-m@62afa0c
TrustedFirmware-M/trusted-firmware-m@a2280a5
TrustedFirmware-M/trusted-firmware-m@94403de
TrustedFirmware-M/trusted-firmware-m@01a4fa4
TrustedFirmware-M/trusted-firmware-m@01a4fa4
TrustedFirmware-M/trusted-firmware-m@c60128e
TrustedFirmware-M/trusted-firmware-m@c58c975
TrustedFirmware-M/trusted-firmware-m@e280ac1
See the commits for more details