Skip to content

Commit a66e004

Browse files
soc: nordic: activate uicr generation and use correct dt reg check
- Activate the UICR file generation and PeriphConf for nRF92 application. - Add condition in reg dt check file to use the correct uicr node name for nRF92X. Signed-off-by: Aymen LAOUINI <[email protected]>
1 parent c83de7e commit a66e004

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

soc/nordic/common/uicr/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
config NRF_PERIPHCONF_SECTION
55
bool "Populate global peripheral initialization section"
6-
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD
6+
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF9280_CPUAPP
77
depends on LINKER_DEVNULL_SUPPORT
88
imply LINKER_DEVNULL_MEMORY
99
help
@@ -12,7 +12,7 @@ config NRF_PERIPHCONF_SECTION
1212

1313
config NRF_PERIPHCONF_GENERATE_ENTRIES
1414
bool "Generate PERIPHCONF entries source file"
15-
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD
15+
default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF9280_CPUAPP
1616
depends on NRF_PERIPHCONF_SECTION
1717
depends on NRF_PLATFORM_HALTIUM
1818
help

soc/nordic/common/uicr/Kconfig.sysbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
config NRF_HALTIUM_GENERATE_UICR
55
bool "Generate UICR file"
6-
depends on SOC_SERIES_NRF54HX
6+
depends on SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X
77
default y
88
help
99
Generate UICR HEX file.

soc/nordic/validate_base_addresses.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ CHECK_DT_REG(uart134, NRF_UARTE134);
346346
CHECK_DT_REG(uart135, NRF_UARTE135);
347347
CHECK_DT_REG(uart136, NRF_UARTE136);
348348
CHECK_DT_REG(uart137, NRF_UARTE137);
349-
#if !defined(CONFIG_SOC_SERIES_NRF54HX)
349+
#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_SOC_SERIES_NRF92X)
350350
CHECK_DT_REG(uicr, NRF_UICR);
351351
#else
352352
CHECK_DT_REG(uicr, NRF_APPLICATION_UICR);

0 commit comments

Comments
 (0)