Skip to content

Commit

Permalink
Merge branch 'feature/freertos_upgrade_to_v10_5_1' into 'master'
Browse files Browse the repository at this point in the history
change(freertos): Upgrade ESP-IDF to use FreeRTOS v10.5.1, remove v10.4.3

Closes IDF-8191, IDF-8200, IDF-8201, IDF-8363, and IDF-8364

See merge request espressif/esp-idf!26261
  • Loading branch information
ESP-Marius committed Oct 23, 2023
2 parents c79dc27 + 94b4659 commit b0124b9
Show file tree
Hide file tree
Showing 94 changed files with 4,834 additions and 39,074 deletions.
1 change: 0 additions & 1 deletion Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -590,4 +590,3 @@ mainmenu "Espressif IoT Development Framework Configuration"
- CONFIG_ESPTOOLPY_FLASHFREQ_120M
- CONFIG_SPIRAM_SPEED_120M
- CONFIG_SPI_FLASH_QUAD_32BIT_ADDR_ENABLE
- CONFIG_FREERTOS_USE_KERNEL_10_5_1
74 changes: 17 additions & 57 deletions components/freertos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ idf_build_get_property(target IDF_TARGET)
if(CONFIG_FREERTOS_SMP)
set(kernel_impl "FreeRTOS-Kernel-SMP")
else()
if(CONFIG_FREERTOS_USE_KERNEL_10_5_1)
set(kernel_impl "FreeRTOS-Kernel-V10.5.1")
else()
set(kernel_impl "FreeRTOS-Kernel")
endif()
set(kernel_impl "FreeRTOS-Kernel")
endif()

if(CONFIG_IDF_TARGET_ARCH_XTENSA)
Expand Down Expand Up @@ -73,52 +69,27 @@ list(APPEND srcs
"${kernel_impl}/timers.c"
"${kernel_impl}/event_groups.c"
"${kernel_impl}/stream_buffer.c")
if(NOT CONFIG_FREERTOS_USE_KERNEL_10_5_1)
list(APPEND srcs "${kernel_impl}/croutine.c")
endif()

# Add port source files
if(CONFIG_FREERTOS_USE_KERNEL_10_5_1)
list(APPEND srcs
"FreeRTOS-Kernel/portable/${arch}/port.c")
else()
list(APPEND srcs
"${kernel_impl}/portable/${arch}/port.c")
endif()
list(APPEND srcs
"${kernel_impl}/portable/${arch}/port.c")

if(arch STREQUAL "linux")
if(CONFIG_FREERTOS_USE_KERNEL_10_5_1)
list(APPEND srcs
"FreeRTOS-Kernel/portable/${arch}/utils/wait_for_event.c"
"FreeRTOS-Kernel/portable/${arch}/port_idf.c")
else()
list(APPEND srcs
"${kernel_impl}/portable/${arch}/utils/wait_for_event.c")
if(kernel_impl STREQUAL "FreeRTOS-Kernel")
list(APPEND srcs
"${kernel_impl}/portable/${arch}/utils/wait_for_event.c")
if(kernel_impl STREQUAL "FreeRTOS-Kernel")
list(APPEND srcs
"${kernel_impl}/portable/${arch}/port_idf.c")
endif()
"${kernel_impl}/portable/${arch}/port_idf.c")
endif()
else()
if(CONFIG_FREERTOS_USE_KERNEL_10_5_1)
list(APPEND srcs
"FreeRTOS-Kernel/portable/${arch}/portasm.S")
else()
list(APPEND srcs
"${kernel_impl}/portable/${arch}/portasm.S")
endif()
list(APPEND srcs
"${kernel_impl}/portable/${arch}/portasm.S")
endif()

if(arch STREQUAL "xtensa")
if(CONFIG_FREERTOS_USE_KERNEL_10_5_1)
list(APPEND srcs
"FreeRTOS-Kernel/portable/${arch}/xtensa_init.c"
"FreeRTOS-Kernel/portable/${arch}/xtensa_overlay_os_hook.c")
else()
list(APPEND srcs
"${kernel_impl}/portable/${arch}/xtensa_init.c"
"${kernel_impl}/portable/${arch}/xtensa_overlay_os_hook.c")
endif()
list(APPEND srcs
"${kernel_impl}/portable/${arch}/xtensa_init.c"
"${kernel_impl}/portable/${arch}/xtensa_overlay_os_hook.c")
endif()

# Add ESP-additions source files
Expand Down Expand Up @@ -151,15 +122,9 @@ list(APPEND include_dirs
"${kernel_impl}/include") # FreeRTOS headers via `#include "freertos/xxx.h"`

# Add port public include directories
if(CONFIG_FREERTOS_USE_KERNEL_10_5_1)
list(APPEND include_dirs
"FreeRTOS-Kernel/portable/${arch}/include" # For port headers via `#include "freertos/...h"`
"FreeRTOS-Kernel/portable/${arch}/include/freertos") # For port headers via `#include "...h"`
else()
list(APPEND include_dirs
"${kernel_impl}/portable/${arch}/include" # For port headers via `#include "freertos/...h"`
"${kernel_impl}/portable/${arch}/include/freertos") # For port headers via `#include "...h"`
endif()
list(APPEND include_dirs
"${kernel_impl}/portable/${arch}/include" # For port headers via `#include "freertos/...h"`
"${kernel_impl}/portable/${arch}/include/freertos") # For port headers via `#include "...h"`

# Add ESP-additions public include directories
list(APPEND include_dirs
Expand All @@ -181,13 +146,8 @@ list(APPEND private_include_dirs

# Add port private include directories
if(arch STREQUAL "linux")
if(CONFIG_FREERTOS_USE_KERNEL_10_5_1)
list(APPEND private_include_dirs
"FreeRTOS-Kernel/portable/${arch}/") # Linux port `#include "utils/wait_for_event.h"`
else()
list(APPEND private_include_dirs
"${kernel_impl}/portable/${arch}/") # Linux port `#include "utils/wait_for_event.h"`
endif()
list(APPEND private_include_dirs
"${kernel_impl}/portable/${arch}/") # Linux port `#include "utils/wait_for_event.h"`
endif()

# Add ESP-additions private include directories
Expand Down
19 changes: 0 additions & 19 deletions components/freertos/FreeRTOS-Kernel-V10.5.1/LICENSE.md

This file was deleted.

Loading

0 comments on commit b0124b9

Please sign in to comment.