From 0b52052a19513abae4e9af9f3e7c90d03804da21 Mon Sep 17 00:00:00 2001 From: Marcin Szymczyk Date: Thu, 23 Jan 2025 12:50:33 +0100 Subject: [PATCH] soc: nordic: vpr: use `SystemInit()` as `soc_reset_hook` Similarly to ARM cores, VPRs should call `SystemInit()` at reset. Signed-off-by: Marcin Szymczyk --- soc/nordic/Kconfig | 2 +- soc/nordic/common/CMakeLists.txt | 10 ++++------ .../common/{arm_platform_init.ld => platform_init.ld} | 0 3 files changed, 5 insertions(+), 7 deletions(-) rename soc/nordic/common/{arm_platform_init.ld => platform_init.ld} (100%) diff --git a/soc/nordic/Kconfig b/soc/nordic/Kconfig index f380eb64bb6..f510c1ec391 100644 --- a/soc/nordic/Kconfig +++ b/soc/nordic/Kconfig @@ -8,7 +8,7 @@ config SOC_FAMILY_NORDIC_NRF select SOC_COMPATIBLE_NRF - select SOC_RESET_HOOK if ARM + select SOC_RESET_HOOK select CMSIS_CORE_HAS_SYSTEM_CORE_CLOCK if ARM if SOC_FAMILY_NORDIC_NRF diff --git a/soc/nordic/common/CMakeLists.txt b/soc/nordic/common/CMakeLists.txt index 8c00b768b90..04cd174d28e 100644 --- a/soc/nordic/common/CMakeLists.txt +++ b/soc/nordic/common/CMakeLists.txt @@ -3,13 +3,11 @@ add_subdirectory_ifdef(CONFIG_RISCV_CORE_NORDIC_VPR vpr) -if(CONFIG_ARM) - # Let SystemInit() be called in place of soc_reset_hook() by default. - zephyr_linker_symbol(SYMBOL soc_reset_hook EXPR "@SystemInit@") +# Let SystemInit() be called in place of soc_reset_hook() by default. +zephyr_linker_symbol(SYMBOL soc_reset_hook EXPR "@SystemInit@") - # This file is used when the CMake linker script generator is disabled. - zephyr_linker_sources(SECTIONS arm_platform_init.ld) -endif() +# This file is used when the CMake linker script generator is disabled. +zephyr_linker_sources(SECTIONS platform_init.ld) zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c) if(CONFIG_ARM) diff --git a/soc/nordic/common/arm_platform_init.ld b/soc/nordic/common/platform_init.ld similarity index 100% rename from soc/nordic/common/arm_platform_init.ld rename to soc/nordic/common/platform_init.ld