patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

soc: nordic: Fix undefined z_arm_platform_init

Browse source 
Fixes #71511
Follow-up to #70977

Update the approach by moving the `PROVIDE` directive to a separate
linker script added using `zephyr_linker_sources()`. This makes the
change more likely to propagate to existing samples which are using
CONFIG_CUSTOM_LINKER_SCRIPT.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
This commit is contained in:
Grzegorz Swiderski 2024-04-17 08:12:58 +02:00 committed by Fabio Baltieri
parent d3e7adc7da
commit f16b33e902
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
soc/nordic/CMakeLists.txt
View file

@ -2,7 +2,9 @@
zephyr_library() zephyr_library()
set(SOC_LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld CACHE INTERNAL "SoC Linker script") if(CONFIG_ARM)
set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "SoC Linker script")
endif()
zephyr_library_sources( zephyr_library_sources(
validate_base_addresses.c validate_base_addresses.c

2
soc/nordic/common/CMakeLists.txt
View file

@ -3,6 +3,8 @@
add_subdirectory_ifdef(CONFIG_RISCV_CORE_NORDIC_VPR vpr) add_subdirectory_ifdef(CONFIG_RISCV_CORE_NORDIC_VPR vpr)
zephyr_linker_sources_ifdef(CONFIG_ARM SECTIONS arm_platform_init.ld)
zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c) zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
zephyr_include_directories(.) zephyr_include_directories(.)

11
soc/nordic/linker.ld → soc/nordic/common/arm_platform_init.ld
View file

@ -4,16 +4,5 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#if defined(CONFIG_ARM)
#include <zephyr/arch/arm/cortex_m/scripts/linker.ld>
/* Let SystemInit() be called in place of z_arm_platform_init() by default. */ /* Let SystemInit() be called in place of z_arm_platform_init() by default. */
PROVIDE(z_arm_platform_init = SystemInit); PROVIDE(z_arm_platform_init = SystemInit);
#elif defined(CONFIG_RISCV)
#include <zephyr/arch/riscv/common/linker.ld>
#else
#error Unsupported architecture
#endif

2
soc/nordic/common/vpr/CMakeLists.txt
View file

@ -4,3 +4,5 @@
zephyr_include_directories(.) zephyr_include_directories(.)
zephyr_library_sources(soc_idle.c soc_irq.S soc_irq.c vector.S) zephyr_library_sources(soc_idle.c soc_irq.S soc_irq.c vector.S)
set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/riscv/common/linker.ld CACHE INTERNAL "")