Skip to content

Commit 3d32c38

Browse files
committed
Rp2350: use absolute paths for linker scripts
1 parent 4c94a52 commit 3d32c38

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

IDE/pico-sdk/rp2350/test-app/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cmake_minimum_required(VERSION 3.13)
2-
set(WOLFBOOT_PATH ../../../../)
2+
set(WOLFBOOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
3+
get_filename_component(WOLFBOOT_PATH "${WOLFBOOT_PATH}" ABSOLUTE)
34
set(CMAKE_CXX_COMPILER arm-none-eabi-gcc)
45
set(LIB_PICO_RUNTIME_INIT=0)
56

@@ -27,7 +28,7 @@ target_compile_options(blink PRIVATE
2728
)
2829
target_compile_definitions(blink PRIVATE PICO_NO_RUNTIME=1)
2930

30-
pico_set_linker_script(blink ../../../../../hal/rp2350-app.ld)
31+
pico_set_linker_script(blink ${WOLFBOOT_PATH}/hal/rp2350-app.ld)
3132
target_link_libraries(blink pico_stdlib)
3233

3334
# create map/bin/hex/uf2 file etc.

IDE/pico-sdk/rp2350/wolfboot/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cmake_minimum_required(VERSION 3.13)
2-
set(WOLFBOOT_PATH ../../../..)
2+
set(WOLFBOOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../..")
3+
get_filename_component(WOLFBOOT_PATH "${WOLFBOOT_PATH}" ABSOLUTE)
34
set(CMAKE_CXX_COMPILER arm-none-eabi-gcc)
45

56
include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
@@ -65,7 +66,7 @@ target_include_directories(wolfboot PRIVATE
6566
)
6667

6768
target_link_libraries(wolfboot pico_stdlib hardware_flash)
68-
pico_set_linker_script(wolfboot ../../../../../hal/rp2350.ld)
69+
pico_set_linker_script(wolfboot ${WOLFBOOT_PATH}/hal/rp2350.ld)
6970

7071
pico_enable_stdio_usb(wolfboot 1)
7172
pico_enable_stdio_uart(wolfboot 0)

0 commit comments

Comments
 (0)