Skip to content

Commit f755c21

Browse files
committed
boards: nrf53: config EXTDOMAIN in soc to reduce code duplication
Configure the "cpunet" to be secure from the soc system initialization to avoid code duplication across all the boards. cpunet is now configured to be secure earlier in the boot process, from POST_KERNEL to PRE_KERNEL, but AFAIK this is not a problem. Signed-off-by: Sebastian Bøe <[email protected]>
1 parent d81b54b commit f755c21

File tree

4 files changed

+1
-22
lines changed

4 files changed

+1
-22
lines changed

boards/nordic/nrf7002dk/nrf5340_cpunet_nrf7001_reset.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ static void remoteproc_mgr_config(void)
2424
/* Route Bluetooth Controller Debug Pins */
2525
DEBUG_SETUP();
2626
#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(CONFIG_BUILD_WITH_TFM) */
27-
28-
#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
29-
/* Retain nRF5340 Network MCU in Secure domain (bus
30-
* accesses by Network MCU will have Secure attribute set).
31-
*/
32-
NRF_SPU->EXTDOMAIN[0].PERM = BIT(4);
33-
#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
3427
}
3528

3629
static int remoteproc_mgr_boot(void)

boards/nordic/nrf7002dk/nrf5340_cpunet_reset.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ static void remoteproc_mgr_config(void)
2424
/* Route Bluetooth Controller Debug Pins */
2525
DEBUG_SETUP();
2626
#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(CONFIG_BUILD_WITH_TFM) */
27-
28-
#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
29-
/* Retain nRF5340 Network MCU in Secure domain (bus
30-
* accesses by Network MCU will have Secure attribute set).
31-
*/
32-
NRF_SPU->EXTDOMAIN[0].PERM = BIT(4);
33-
#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
3427
}
3528

3629
static int remoteproc_mgr_boot(void)

boards/nordic/thingy91x/nrf5340_cpunet_reset.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ static void remoteproc_mgr_config(void)
2424
/* Route Bluetooth Controller Debug Pins */
2525
DEBUG_SETUP();
2626
#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(CONFIG_BUILD_WITH_TFM) */
27-
28-
#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
29-
/* Retain nRF5340 Network MCU in Secure domain (bus
30-
* accesses by Network MCU will have Secure attribute set).
31-
*/
32-
NRF_SPU->EXTDOMAIN[0].PERM = BIT(4);
33-
#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
3427
}
3528

3629
static int remoteproc_mgr_boot(void)

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ manifest:
6363
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6464
- name: zephyr
6565
repo-path: sdk-zephyr
66-
revision: a1769aba631b078769d182eaaea13aafc09039bc
66+
revision: pull/1749/head
6767
import:
6868
# In addition to the zephyr repository itself, NCS also
6969
# imports the contents of zephyr/west.yml at the above

0 commit comments

Comments
 (0)