Skip to content

Commit 517331a

Browse files
[nrf fromlist] soc: nordic: add support of 'iron' variant to application
- use early init hook instead of nrf92_init. - add config flag for iron variant. Upstream PR #: 90756 Signed-off-by: Aymen LAOUINI <[email protected]>
1 parent 68ab1cf commit 517331a

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

soc/nordic/nrf92/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ config SOC_SERIES_NRF92X
77
select HAS_NRFS
88
select HAS_NRFX
99
select HAS_NORDIC_DRIVERS
10+
select SOC_EARLY_INIT_HOOK if ARM
1011
select NRF_PLATFORM_HALTIUM
1112

1213
config SOC_NRF9230_ENGB_CPUAPP
@@ -48,3 +49,6 @@ config SOC_NRF9230_ENGB_CPURAD
4849

4950
config SOC_NRF9230_ENGB_CPUPPR
5051
select RISCV_CORE_NORDIC_VPR
52+
53+
config SOC_NRF9280_IRON
54+
select EXPERIMENTAL if MCUBOOT

soc/nordic/nrf92/Kconfig.soc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,20 @@ config SOC_NRF9280_CPUPPR
6262
help
6363
nRF9280 CPUPPR
6464

65+
config SOC_NRF9280_IRON
66+
bool
67+
help
68+
Indicates that local domain firmware is compatible with Nordic IRONside SE.
69+
6570
config SOC
6671
default "nrf9280" if SOC_NRF9280
72+
73+
config SOC_SERIES_NRF92X_IRON
74+
bool
75+
help
76+
Generic Nordic IRONside SE for Series nRF92X.
77+
78+
config SOC_SERIES_NRF92X_CPUAPP
79+
bool
80+
help
81+
Generic Nordic application core for Series nRF92X.

soc/nordic/nrf92/soc.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static int trim_hsfll(void)
8484
return 0;
8585
}
8686

87-
static int nordicsemi_nrf92_init(void)
87+
void soc_early_init_hook(void)
8888
{
8989
sys_cache_instr_enable();
9090
sys_cache_data_enable();
@@ -102,13 +102,9 @@ static int nordicsemi_nrf92_init(void)
102102

103103
nrf_spu_periph_perm_dmasec_set(spu, nrf_address_slave_get(ccm030_addr), true);
104104
#endif
105-
106-
return 0;
107105
}
108106

109107
void arch_busy_wait(uint32_t time_us)
110108
{
111109
nrfx_coredep_delay_us(time_us);
112110
}
113-
114-
SYS_INIT(nordicsemi_nrf92_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

0 commit comments

Comments
 (0)