Skip to content

[nrf fromtree] Activate UICR generation for nrf92 #3241

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

[nrf fromtree] Activate UICR generation for nrf92 #3241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf6280f
dts: nordic: add uicr node to nrf9280 dtsi
ayla-nordicsemi Aug 29, 2025
c83de7e
boards: nordic: add periphconf_partition to memory map for nRF9280
ayla-nordicsemi Aug 29, 2025
a66e004
soc: nordic: activate uicr generation and use correct dt reg check
ayla-nordicsemi Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map_iron.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,9 @@
storage_partition: partition@600000 {
reg = <0x600000 DT_SIZE_K(40)>;
};

periphconf_partition: partition@60a000 {
reg = <0x60a000 DT_SIZE_K(8)>;
};
};
};
14 changes: 5 additions & 9 deletions dts/vendor/nordic/nrf9280.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,12 @@
write-block-size = <16>;
};

cpuapp_uicr: uicr@fff8000 {
compatible = "nordic,nrf-uicr-v2";
uicr: uicr@fff8000 {
compatible = "nordic,nrf-uicr";
reg = <0xfff8000 DT_SIZE_K(2)>;
domain = <2>;
};

cpurad_uicr: uicr@fffa000 {
compatible = "nordic,nrf-uicr-v2";
reg = <0xfffa000 DT_SIZE_K(2)>;
domain = <3>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0xfff8000 DT_SIZE_K(2)>;
};

ficr: ficr@fffe000 {
Expand Down
4 changes: 2 additions & 2 deletions soc/nordic/common/uicr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

config NRF_PERIPHCONF_SECTION
bool "Populate global peripheral initialization section"
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF9280_CPUAPP
depends on LINKER_DEVNULL_SUPPORT
imply LINKER_DEVNULL_MEMORY
help
Expand All @@ -12,7 +12,7 @@ config NRF_PERIPHCONF_SECTION

config NRF_PERIPHCONF_GENERATE_ENTRIES
bool "Generate PERIPHCONF entries source file"
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF9280_CPUAPP
depends on NRF_PERIPHCONF_SECTION
depends on NRF_PLATFORM_HALTIUM
help
Expand Down
2 changes: 1 addition & 1 deletion soc/nordic/common/uicr/Kconfig.sysbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

config NRF_HALTIUM_GENERATE_UICR
bool "Generate UICR file"
depends on SOC_SERIES_NRF54HX
depends on SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X
default y
help
Generate UICR HEX file.
2 changes: 1 addition & 1 deletion soc/nordic/validate_base_addresses.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ CHECK_DT_REG(uart134, NRF_UARTE134);
CHECK_DT_REG(uart135, NRF_UARTE135);
CHECK_DT_REG(uart136, NRF_UARTE136);
CHECK_DT_REG(uart137, NRF_UARTE137);
#if !defined(CONFIG_SOC_SERIES_NRF54HX)
#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_SOC_SERIES_NRF92X)
CHECK_DT_REG(uicr, NRF_UICR);
#else
CHECK_DT_REG(uicr, NRF_APPLICATION_UICR);
Expand Down
Loading