Skip to content

Commit 94f8446

Browse files
authored
Merge branch 'main' into refine_rvv_context
2 parents 1ca14e2 + 8b63f94 commit 94f8446

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

examples/template_configuration/FreeRTOSConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@
653653
#define INCLUDE_uxTaskPriorityGet 1
654654
#define INCLUDE_vTaskDelete 1
655655
#define INCLUDE_vTaskSuspend 1
656-
#define INCLUDE_vTaskDelayUntil 1
656+
#define INCLUDE_xTaskDelayUntil 1
657657
#define INCLUDE_vTaskDelay 1
658658
#define INCLUDE_xTaskGetSchedulerState 1
659659
#define INCLUDE_xTaskGetCurrentTaskHandle 1

portable/ThirdParty/GCC/RP2040/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ if (NOT TARGET _FreeRTOS_kernel_inclusion_marker)
4545
set(FREERTOS_KERNEL_PATH ${FREERTOS_KERNEL_PATH} PARENT_SCOPE)
4646
set(PICO_CONFIG_HEADER_FILES ${PICO_CONFIG_HEADER_FILES} PARENT_SCOPE)
4747
set(PICO_SDK_POST_LIST_FILES ${PICO_SDK_POST_LIST_FILES} PARENT_SCOPE)
48+
set(PICO_SDK_VERSION_MAJOR ${PICO_SDK_VERSION_MAJOR} PARENT_SCOPE)
49+
set(PICO_SDK_VERSION_MINOR ${PICO_SDK_VERSION_MINOR} PARENT_SCOPE)
50+
set(PICO_SDK_VERSION_REVISION ${PICO_SDK_VERSION_REVISION} PARENT_SCOPE)
4851
endif()
4952
endif()
5053
endif()

0 commit comments

Comments
 (0)