espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-27 15:40:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

freertos: Update components CMakeLists.txt and Add SMP Kconfig option

Browse Source 
This commit does the following:

- Add a Kconfig option to select between the IDF FreeRTOS kernel and the
  FreeRTOS SMP kernel.
- Updates the freertos component's CMakeLists.txt so that FreeRTOS SMP
  files are now built based the the new configuration option.

This commit WILL NOT compile. The port files for FreeRTOS SMP still need to
be updated.
This commit is contained in:
Darian Leung
2022-02-24 21:03:39 +08:00
parent 89dd2fe7f5
commit 163ddc3818
3 changed files with 112 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
components/freertos/CMakeLists.txt
View File

@@ -6,66 +6,111 @@ endif()
idf_build_get_property(target IDF_TARGET) idf_build_get_property(target IDF_TARGET)
if(CONFIG_IDF_TARGET_ARCH_XTENSA) if(CONFIG_FREERTOS_SMP)
set(srcs if(CONFIG_IDF_TARGET_ARCH_XTENSA)
"FreeRTOS-Kernel/portable/xtensa/port.c" set(srcs
"FreeRTOS-Kernel/portable/xtensa/portasm.S" "FreeRTOS-Kernel-SMP/portable/xtensa/port.c"
"FreeRTOS-Kernel/portable/xtensa/xtensa_context.S" "FreeRTOS-Kernel-SMP/portable/xtensa/portasm.S"
"FreeRTOS-Kernel/portable/xtensa/xtensa_init.c" "FreeRTOS-Kernel-SMP/portable/xtensa/xtensa_context.S"
"FreeRTOS-Kernel/portable/xtensa/xtensa_overlay_os_hook.c" "FreeRTOS-Kernel-SMP/portable/xtensa/xtensa_init.c"
"FreeRTOS-Kernel/portable/xtensa/xtensa_vector_defaults.S" "FreeRTOS-Kernel-SMP/portable/xtensa/xtensa_overlay_os_hook.c"
"FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S") "FreeRTOS-Kernel-SMP/portable/xtensa/xtensa_vector_defaults.S"
"FreeRTOS-Kernel-SMP/portable/xtensa/xtensa_vectors.S")
set(include_dirs set(include_dirs
FreeRTOS-Kernel/include "FreeRTOS-Kernel-SMP/include" # FreeRTOS headers via #include "freertos/xxx.h"
esp_additions/include/freertos # For files with #include "FreeRTOSConfig.h" "esp_additions/include/freertos" # For config via #include "FreeRTOSConfig.h"
FreeRTOS-Kernel/portable/xtensa/include # For arch-specific FreeRTOSConfig_arch.h in portable/<arch>/include "FreeRTOS-Kernel-SMP/portable/xtensa/include" # Xtensa/Arch Config headers via #include "freertos/xxx.h"
esp_additions/include) # For files with #include "freertos/FreeRTOSConfig.h" "esp_additions/include" # For #include "freertos/task_snapshot.h" and #include "freertos/FreeRTOSConfig.h"
"FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos") # Xtensa headers via #include "xxx.h"
set(private_include_dirs set(private_include_dirs
FreeRTOS-Kernel/portable/xtensa/include/freertos "FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos"
FreeRTOS-Kernel/portable/xtensa "FreeRTOS-Kernel-SMP/portable/xtensa"
FreeRTOS-Kernel/portable/priv_include .)
.) endif()
elseif(CONFIG_IDF_TARGET_ARCH_RISCV) list(APPEND srcs
set(srcs "esp_additions/task_snapshot.c"
"FreeRTOS-Kernel/portable/riscv/port.c" "FreeRTOS-Kernel-SMP/croutine.c"
"FreeRTOS-Kernel/portable/riscv/portasm.S") "FreeRTOS-Kernel-SMP/event_groups.c"
"FreeRTOS-Kernel-SMP/list.c"
"FreeRTOS-Kernel-SMP/queue.c"
"FreeRTOS-Kernel-SMP/tasks.c"
"FreeRTOS-Kernel-SMP/timers.c"
"FreeRTOS-Kernel-SMP/stream_buffer.c"
"FreeRTOS-openocd.c"
)
set(include_dirs list(APPEND private_include_dirs
FreeRTOS-Kernel/include "FreeRTOS-Kernel-SMP/include/freertos") # FreeRTOS headers via #include "xxx.h"
esp_additions/include/freertos # For files with #include "FreeRTOSConfig.h"
FreeRTOS-Kernel/portable/riscv/include # For arch-specific FreeRTOSConfig_arch.h in portable/<arch>/include
esp_additions/include) # For files with #include "freertos/FreeRTOSConfig.h"
set(private_include_dirs if(CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY)
FreeRTOS-Kernel/portable/riscv/include/freertos list(APPEND srcs "FreeRTOS-Kernel-SMP/portable/xtensa/xtensa_loadstore_handler.S")
FreeRTOS-Kernel/portable/riscv endif()
FreeRTOS-Kernel/portable/priv_include
.)
endif() else()
if(CONFIG_IDF_TARGET_ARCH_XTENSA)
set(srcs
"FreeRTOS-Kernel/portable/xtensa/port.c"
"FreeRTOS-Kernel/portable/xtensa/portasm.S"
"FreeRTOS-Kernel/portable/xtensa/xtensa_context.S"
"FreeRTOS-Kernel/portable/xtensa/xtensa_init.c"
"FreeRTOS-Kernel/portable/xtensa/xtensa_overlay_os_hook.c"
"FreeRTOS-Kernel/portable/xtensa/xtensa_vector_defaults.S"
"FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S")
list(APPEND srcs set(include_dirs
"esp_additions/task_snapshot.c" FreeRTOS-Kernel/include
"FreeRTOS-Kernel/portable/port_common.c" esp_additions/include/freertos # For files with #include "FreeRTOSConfig.h"
"FreeRTOS-Kernel/portable/port_systick.c" FreeRTOS-Kernel/portable/xtensa/include # For arch-specific FreeRTOSConfig_arch.h in portable/<arch>/include
"FreeRTOS-Kernel/croutine.c" esp_additions/include) # For files with #include "freertos/FreeRTOSConfig.h"
"FreeRTOS-Kernel/event_groups.c"
"FreeRTOS-Kernel/list.c"
"FreeRTOS-Kernel/queue.c"
"FreeRTOS-Kernel/tasks.c"
"FreeRTOS-Kernel/timers.c"
"FreeRTOS-Kernel/stream_buffer.c"
"FreeRTOS-openocd.c"
"esp_additions/freertos_v8_compat.c")
list(APPEND private_include_dirs set(private_include_dirs
"FreeRTOS-Kernel/include/freertos") FreeRTOS-Kernel/portable/xtensa/include/freertos
FreeRTOS-Kernel/portable/xtensa
FreeRTOS-Kernel/portable/priv_include
.)
if(CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY) elseif(CONFIG_IDF_TARGET_ARCH_RISCV)
list(APPEND srcs "FreeRTOS-Kernel/portable/xtensa/xtensa_loadstore_handler.S") set(srcs
"FreeRTOS-Kernel/portable/riscv/port.c"
"FreeRTOS-Kernel/portable/riscv/portasm.S")
set(include_dirs
FreeRTOS-Kernel/include
esp_additions/include/freertos # For files with #include "FreeRTOSConfig.h"
FreeRTOS-Kernel/portable/riscv/include # For arch-specific FreeRTOSConfig_arch.h in portable/<arch>/include
esp_additions/include) # For files with #include "freertos/FreeRTOSConfig.h"
set(private_include_dirs
FreeRTOS-Kernel/portable/riscv/include/freertos
FreeRTOS-Kernel/portable/riscv
FreeRTOS-Kernel/portable/priv_include
.)
endif()
list(APPEND srcs
"esp_additions/task_snapshot.c"
"FreeRTOS-Kernel/portable/port_common.c"
"FreeRTOS-Kernel/portable/port_systick.c"
"FreeRTOS-Kernel/croutine.c"
"FreeRTOS-Kernel/event_groups.c"
"FreeRTOS-Kernel/list.c"
"FreeRTOS-Kernel/queue.c"
"FreeRTOS-Kernel/tasks.c"
"FreeRTOS-Kernel/timers.c"
"FreeRTOS-Kernel/stream_buffer.c"
"FreeRTOS-openocd.c"
"esp_additions/freertos_v8_compat.c")
list(APPEND private_include_dirs
"FreeRTOS-Kernel/include/freertos")
if(CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY)
list(APPEND srcs "FreeRTOS-Kernel/portable/xtensa/xtensa_loadstore_handler.S")
endif()
endif() endif()
# esp_timer is required by FreeRTOS when we use esp_timer_get_time() to do profiling # esp_timer is required by FreeRTOS when we use esp_timer_get_time() to do profiling
@@ -114,3 +159,8 @@ elseif(CONFIG_APPTRACE_ENABLE)
# this should be resolved when link-time registration of startup functions is added. # this should be resolved when link-time registration of startup functions is added.
idf_component_optional_requires(PRIVATE app_trace) idf_component_optional_requires(PRIVATE app_trace)
endif() endif()
if(CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME)
# [refactor-todo]: port.c esp_startup_start_app_common() calls esp_gdbstub_init()
idf_component_optional_requires(PRIVATE esp_gdbstub)
endif()

8
components/freertos/Kconfig
View File

@@ -1,5 +1,13 @@
menu "FreeRTOS" menu "FreeRTOS"
config FREERTOS_SMP
bool "Run the SMP FreeRTOS kernel instead (FEATURE UNDER DEVELOPMENT)"
depends on IDF_TARGET_ESP32
default "n"
help
This will cause the FreeRTOS component to compile with the SMP FreeRTOS kernel instead.
THIS FEATURE IS UNDER ACTIVE DEVELOPMENT, users use this at their own risk.
config FREERTOS_UNICORE config FREERTOS_UNICORE
bool "Run FreeRTOS only on first core" bool "Run FreeRTOS only on first core"
default "y" if IDF_TARGET_ESP32S2 default "y" if IDF_TARGET_ESP32S2

3
tools/ci/check_public_headers_exceptions.txt
View File

@@ -6,8 +6,11 @@ components/xtensa/esp32/include/xtensa/config/
components/newlib/platform_include/ components/newlib/platform_include/
components/freertos/esp_additions/include/freertos_tasks_c_additions.h
components/freertos/FreeRTOS-Kernel/include/freertos/ components/freertos/FreeRTOS-Kernel/include/freertos/
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/ components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/
components/freertos/FreeRTOS-Kernel-SMP/include/freertos/
components/freertos/FreeRTOS-Kernel-SMP/portable/xtensa/include/freertos/
components/log/include/esp_log_internal.h components/log/include/esp_log_internal.h