Skip to content

fromtree - Add support for nRF7120 UICR generation and VPR launcher for FLPR#3989

Merged
rlubos merged 5 commits into
nrfconnect:mainfrom
dhsu-nordic:cherry-pick/nrf7120-uicr
May 11, 2026
Merged

fromtree - Add support for nRF7120 UICR generation and VPR launcher for FLPR#3989
rlubos merged 5 commits into
nrfconnect:mainfrom
dhsu-nordic:cherry-pick/nrf7120-uicr

Conversation

@dhsu-nordic
Copy link
Copy Markdown
Contributor

@dhsu-nordic dhsu-nordic commented Apr 16, 2026

  • [nrf fromtree] dts: bindings: arm: nordic: Add nRF71 series UICR binding
  • [nrf fromtree] dts: vendor: nordic: Update nRF7120 to use specific UICR binding
  • [nrf fromtree] soc: nordic: Add UICR generation tooling for nRF71
  • [nrf fromtree] soc: nordic: nrf71: uicr: Fix hex_file override from main image
  • [nrf fromtree] soc: nordic: nrf71: Enable VPR launcher sysbuild Kconfig for cpuflpr

NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request Apr 16, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
@dhsu-nordic dhsu-nordic force-pushed the cherry-pick/nrf7120-uicr branch from f0f4ba9 to 653b71b Compare April 17, 2026 16:09
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request Apr 17, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
@dhsu-nordic
Copy link
Copy Markdown
Contributor Author

Manifest PR currently fail CI build for NS sample. Waiting for this fix in upstream zephyrproject-rtos/zephyr#107615

@dhsu-nordic dhsu-nordic marked this pull request as draft April 22, 2026 15:53
@dhsu-nordic dhsu-nordic force-pushed the cherry-pick/nrf7120-uicr branch from 653b71b to 4325b1d Compare April 24, 2026 12:23
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request Apr 24, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
@dhsu-nordic dhsu-nordic marked this pull request as ready for review April 24, 2026 16:17
@dhsu-nordic dhsu-nordic added this to the ncs-3.3.1 milestone Apr 27, 2026
@dhsu-nordic dhsu-nordic modified the milestones: ncs-3.3.1, ncs-3.4.0 Apr 29, 2026
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 1, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
@dhsu-nordic dhsu-nordic force-pushed the cherry-pick/nrf7120-uicr branch from a3c2f01 to 1d2a274 Compare May 1, 2026 10:02
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 1, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
@dhsu-nordic dhsu-nordic changed the title fromtree - Add support for nRF7120 UICR generation fromtree - Add support for nRF7120 UICR generation and VPR launcher for FLPR May 1, 2026
@dhsu-nordic dhsu-nordic force-pushed the cherry-pick/nrf7120-uicr branch from 1d2a274 to 7ec0974 Compare May 1, 2026 10:26
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 1, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
@dhsu-nordic dhsu-nordic force-pushed the cherry-pick/nrf7120-uicr branch from 7ec0974 to 11b32f9 Compare May 5, 2026 10:33
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 5, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
Add UICR binding for nRF71 series to allow 1.8v supply to be
configured from devicetree.

Signed-off-by: Dhanoo Surasarang <dhanoo.surasarang@nordicsemi.no>
(cherry picked from commit fe44c5a)
…CR binding

Use nordic,nrf71-uicr binding.

Signed-off-by: Dhanoo Surasarang <dhanoo.surasarang@nordicsemi.no>
(cherry picked from commit 0d8c4b3)
Add supporting scripts and build-system integration for UICR
generation.

Signed-off-by: Dhanoo Surasarang <dhanoo.surasarang@nordicsemi.no>
(cherry picked from commit 9d68b8a)
…ain image

Move set_target_properties for runners_yaml_props_target below
board.cmake include so that UICR image always flashes its own
output regardless of the main image configuration.

When the main image targets cpuapp/ns (TF-M), import_kconfig()
pulls CONFIG_TFM_FLASH_MERGED_BINARY into the UICR image's CMake
scope. This causes board.cmake to override hex_file with
tfm_merged.hex, which does not exist in the UICR utility image,
resulting in a flash failure.

Signed-off-by: Dhanoo Surasarang <dhanoo.surasarang@nordicsemi.no>
(cherry picked from commit 16fe56e)
…ig for cpuflpr

Add missing Kconfig.sysbuild to enable VPR launcher image when
building for the FLPR core.

Signed-off-by: Dhanoo Surasarang <dhanoo.surasarang@nordicsemi.no>
(cherry picked from commit a03d8d0)
@dhsu-nordic dhsu-nordic force-pushed the cherry-pick/nrf7120-uicr branch from 11b32f9 to 2e8a11d Compare May 6, 2026 14:51
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 6, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
@rlubos rlubos merged commit b4fc048 into nrfconnect:main May 11, 2026
11 checks passed
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request May 11, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
rlubos pushed a commit to nrfconnect/sdk-nrf that referenced this pull request May 12, 2026
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3989

Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
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.

5 participants