Skip to content

Commit bae4c7a

Browse files
mcknlymcknly
authored
Replaced RP2350 kernel import script with more dynamic RP2040 version that handles both (#18)
1 parent 3c5bfb8 commit bae4c7a

File tree

2 files changed

+108
-66
lines changed

2 files changed

+108
-66
lines changed

‎GCC/RP2350_ARM_NTZ/FreeRTOS_Kernel_import.cmake‎

Lines changed: 54 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,68 @@ if (DEFINED ENV{FREERTOS_KERNEL_PATH} AND (NOT FREERTOS_KERNEL_PATH))
1010
message("Using FREERTOS_KERNEL_PATH from environment ('${FREERTOS_KERNEL_PATH}')")
1111
endif ()
1212

13-
if(PICO_PLATFORM STREQUAL "rp2040")
14-
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/GCC/RP2040")
15-
else()
16-
if (PICO_PLATFORM STREQUAL "rp2350-riscv")
17-
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/GCC/RP2350_RISC-V")
13+
# first pass we look in old tree; second pass we look in new tree
14+
foreach(SEARCH_PASS RANGE 0 1)
15+
if (SEARCH_PASS)
16+
# ports may be moving to submodule in the future
17+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/Community-Supported-Ports/GCC")
18+
set(FREERTOS_KERNEL_RP2040_BACK_PATH "../../../../..")
1819
else()
19-
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/GCC/RP2350_ARM_NTZ")
20+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/GCC")
21+
set(FREERTOS_KERNEL_RP2040_BACK_PATH "../../../..")
2022
endif()
21-
endif()
22-
23-
# undo the above
24-
set(FREERTOS_KERNEL_RP2040_BACK_PATH "../../../..")
2523

26-
if (NOT FREERTOS_KERNEL_PATH)
27-
# check if we are inside the FreeRTOS kernel tree (i.e. this file has been included directly)
28-
get_filename_component(_ACTUAL_PATH ${CMAKE_CURRENT_LIST_DIR} REALPATH)
29-
get_filename_component(_POSSIBLE_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH} REALPATH)
30-
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
31-
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
24+
if(PICO_PLATFORM STREQUAL "rp2040")
25+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/RP2040")
26+
else()
27+
if (PICO_PLATFORM STREQUAL "rp2350-riscv")
28+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/RP2350_RISC-V")
29+
else()
30+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/RP2350_ARM_NTZ")
31+
endif()
3232
endif()
33-
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
34-
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
35-
message("Setting FREERTOS_KERNEL_PATH to ${FREERTOS_KERNEL_PATH} based on location of FreeRTOS-Kernel-import.cmake")
36-
elseif (PICO_SDK_PATH AND EXISTS "${PICO_SDK_PATH}/../FreeRTOS-Kernel")
37-
set(FREERTOS_KERNEL_PATH ${PICO_SDK_PATH}/../FreeRTOS-Kernel)
38-
message("Defaulting FREERTOS_KERNEL_PATH as sibling of PICO_SDK_PATH: ${FREERTOS_KERNEL_PATH}")
33+
34+
if (NOT FREERTOS_KERNEL_PATH)
35+
# check if we are inside the FreeRTOS kernel tree (i.e. this file has been included directly)
36+
get_filename_component(_ACTUAL_PATH ${CMAKE_CURRENT_LIST_DIR} REALPATH)
37+
get_filename_component(_POSSIBLE_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH} REALPATH)
38+
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
39+
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
40+
endif()
41+
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
42+
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
43+
message("Setting FREERTOS_KERNEL_PATH to ${FREERTOS_KERNEL_PATH} based on location of FreeRTOS-Kernel-import.cmake")
44+
break()
45+
elseif (PICO_SDK_PATH AND EXISTS "${PICO_SDK_PATH}/../FreeRTOS-Kernel")
46+
set(FREERTOS_KERNEL_PATH ${PICO_SDK_PATH}/../FreeRTOS-Kernel)
47+
message("Defaulting FREERTOS_KERNEL_PATH as sibling of PICO_SDK_PATH: ${FREERTOS_KERNEL_PATH}")
48+
break()
49+
endif()
50+
endif ()
51+
52+
if (NOT FREERTOS_KERNEL_PATH)
53+
foreach(POSSIBLE_SUFFIX Source FreeRTOS-Kernel FreeRTOS/Source)
54+
# check if FreeRTOS-Kernel exists under directory that included us
55+
set(SEARCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
56+
get_filename_component(_POSSIBLE_PATH ${SEARCH_ROOT}/${POSSIBLE_SUFFIX} REALPATH)
57+
if (EXISTS ${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt)
58+
get_filename_component(FREERTOS_KERNEL_PATH ${_POSSIBLE_PATH} REALPATH)
59+
message("Setting FREERTOS_KERNEL_PATH to '${FREERTOS_KERNEL_PATH}' found relative to enclosing project")
60+
break()
61+
endif()
62+
endforeach()
63+
if (FREERTOS_KERNEL_PATH)
64+
break()
65+
endif()
3966
endif()
40-
endif ()
4167

42-
if (NOT FREERTOS_KERNEL_PATH)
43-
foreach(POSSIBLE_SUFFIX Source FreeRTOS-Kernel FreeRTOS/Source)
44-
# check if FreeRTOS-Kernel exists under directory that included us
45-
set(SEARCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
46-
get_filename_component(_POSSIBLE_PATH ${SEARCH_ROOT}/${POSSIBLE_SUFFIX} REALPATH)
47-
if (EXISTS ${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt)
48-
get_filename_component(FREERTOS_KERNEL_PATH ${_POSSIBLE_PATH} REALPATH)
49-
message("Setting FREERTOS_KERNEL_PATH to '${FREERTOS_KERNEL_PATH}' found relative to enclosing project")
68+
# user must have specified
69+
if (FREERTOS_KERNEL_PATH)
70+
if (EXISTS "${FREERTOS_KERNEL_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}")
5071
break()
5172
endif()
52-
endforeach()
53-
endif()
73+
endif()
74+
endforeach ()
5475

5576
if (NOT FREERTOS_KERNEL_PATH)
5677
message(FATAL_ERROR "FreeRTOS location was not specified. Please set FREERTOS_KERNEL_PATH.")

‎GCC/RP2350_RISC-V/FreeRTOS_Kernel_import.cmake‎

Lines changed: 54 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,68 @@ if (DEFINED ENV{FREERTOS_KERNEL_PATH} AND (NOT FREERTOS_KERNEL_PATH))
1010
message("Using FREERTOS_KERNEL_PATH from environment ('${FREERTOS_KERNEL_PATH}')")
1111
endif ()
1212

13-
if(PICO_PLATFORM STREQUAL "rp2040")
14-
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/GCC/RP2040")
15-
else()
16-
if (PICO_PLATFORM STREQUAL "rp2350-riscv")
17-
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/GCC/RP2350_RISC-V")
13+
# first pass we look in old tree; second pass we look in new tree
14+
foreach(SEARCH_PASS RANGE 0 1)
15+
if (SEARCH_PASS)
16+
# ports may be moving to submodule in the future
17+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/Community-Supported-Ports/GCC")
18+
set(FREERTOS_KERNEL_RP2040_BACK_PATH "../../../../..")
1819
else()
19-
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/GCC/RP2350_ARM_NTZ")
20+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/GCC")
21+
set(FREERTOS_KERNEL_RP2040_BACK_PATH "../../../..")
2022
endif()
21-
endif()
22-
23-
# undo the above
24-
set(FREERTOS_KERNEL_RP2040_BACK_PATH "../../../..")
2523

26-
if (NOT FREERTOS_KERNEL_PATH)
27-
# check if we are inside the FreeRTOS kernel tree (i.e. this file has been included directly)
28-
get_filename_component(_ACTUAL_PATH ${CMAKE_CURRENT_LIST_DIR} REALPATH)
29-
get_filename_component(_POSSIBLE_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH} REALPATH)
30-
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
31-
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
24+
if(PICO_PLATFORM STREQUAL "rp2040")
25+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/RP2040")
26+
else()
27+
if (PICO_PLATFORM STREQUAL "rp2350-riscv")
28+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/RP2350_RISC-V")
29+
else()
30+
set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/RP2350_ARM_NTZ")
31+
endif()
3232
endif()
33-
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
34-
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
35-
message("Setting FREERTOS_KERNEL_PATH to ${FREERTOS_KERNEL_PATH} based on location of FreeRTOS-Kernel-import.cmake")
36-
elseif (PICO_SDK_PATH AND EXISTS "${PICO_SDK_PATH}/../FreeRTOS-Kernel")
37-
set(FREERTOS_KERNEL_PATH ${PICO_SDK_PATH}/../FreeRTOS-Kernel)
38-
message("Defaulting FREERTOS_KERNEL_PATH as sibling of PICO_SDK_PATH: ${FREERTOS_KERNEL_PATH}")
33+
34+
if (NOT FREERTOS_KERNEL_PATH)
35+
# check if we are inside the FreeRTOS kernel tree (i.e. this file has been included directly)
36+
get_filename_component(_ACTUAL_PATH ${CMAKE_CURRENT_LIST_DIR} REALPATH)
37+
get_filename_component(_POSSIBLE_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH} REALPATH)
38+
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
39+
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
40+
endif()
41+
if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH)
42+
get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH)
43+
message("Setting FREERTOS_KERNEL_PATH to ${FREERTOS_KERNEL_PATH} based on location of FreeRTOS-Kernel-import.cmake")
44+
break()
45+
elseif (PICO_SDK_PATH AND EXISTS "${PICO_SDK_PATH}/../FreeRTOS-Kernel")
46+
set(FREERTOS_KERNEL_PATH ${PICO_SDK_PATH}/../FreeRTOS-Kernel)
47+
message("Defaulting FREERTOS_KERNEL_PATH as sibling of PICO_SDK_PATH: ${FREERTOS_KERNEL_PATH}")
48+
break()
49+
endif()
50+
endif ()
51+
52+
if (NOT FREERTOS_KERNEL_PATH)
53+
foreach(POSSIBLE_SUFFIX Source FreeRTOS-Kernel FreeRTOS/Source)
54+
# check if FreeRTOS-Kernel exists under directory that included us
55+
set(SEARCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
56+
get_filename_component(_POSSIBLE_PATH ${SEARCH_ROOT}/${POSSIBLE_SUFFIX} REALPATH)
57+
if (EXISTS ${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt)
58+
get_filename_component(FREERTOS_KERNEL_PATH ${_POSSIBLE_PATH} REALPATH)
59+
message("Setting FREERTOS_KERNEL_PATH to '${FREERTOS_KERNEL_PATH}' found relative to enclosing project")
60+
break()
61+
endif()
62+
endforeach()
63+
if (FREERTOS_KERNEL_PATH)
64+
break()
65+
endif()
3966
endif()
40-
endif ()
4167

42-
if (NOT FREERTOS_KERNEL_PATH)
43-
foreach(POSSIBLE_SUFFIX Source FreeRTOS-Kernel FreeRTOS/Source)
44-
# check if FreeRTOS-Kernel exists under directory that included us
45-
set(SEARCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
46-
get_filename_component(_POSSIBLE_PATH ${SEARCH_ROOT}/${POSSIBLE_SUFFIX} REALPATH)
47-
if (EXISTS ${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt)
48-
get_filename_component(FREERTOS_KERNEL_PATH ${_POSSIBLE_PATH} REALPATH)
49-
message("Setting FREERTOS_KERNEL_PATH to '${FREERTOS_KERNEL_PATH}' found relative to enclosing project")
68+
# user must have specified
69+
if (FREERTOS_KERNEL_PATH)
70+
if (EXISTS "${FREERTOS_KERNEL_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}")
5071
break()
5172
endif()
52-
endforeach()
53-
endif()
73+
endif()
74+
endforeach ()
5475

5576
if (NOT FREERTOS_KERNEL_PATH)
5677
message(FATAL_ERROR "FreeRTOS location was not specified. Please set FREERTOS_KERNEL_PATH.")

0 commit comments

Comments
 (0)