Merge branch 'feature/freertos_linux_target_add_features' into 'master'

freertos/linux: added event group and stream buffer Closes IDF-6007 See merge request espressif/esp-idf!20878
espressif · Nov 3, 2022 · a995c83 · a995c83
2 parents e3ff53d + 37e8f1f
commit a995c83
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/components/freertos/CMakeLists.txt b/components/freertos/CMakeLists.txt
@@ -49,12 +49,6 @@ if(${target} STREQUAL "linux")
     list(APPEND srcs
         "${kernel_dir}/portable/${arch}/port_idf.c"
         "${kernel_dir}/portable/${arch}/utils/wait_for_event.c")
-
-    # TODO: This is temporary until the following files can safely be added to the Linux target:
-    list(REMOVE_ITEM srcs
-        "${kernel_dir}/croutine.c"
-        "${kernel_dir}/event_groups.c"
-        "${kernel_dir}/stream_buffer.c")
 else()
     list(APPEND srcs
         "FreeRTOS-openocd.c"

diff --git a/components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/portmacro_idf.h b/components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/portmacro_idf.h
@@ -13,6 +13,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <stdlib.h> // This is for malloc(), used by portmacro.h
 #include "sdkconfig.h"
 #include "esp_attr.h"
 #include "spinlock.h"

diff --git a/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h b/components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
@@ -191,7 +191,7 @@ This file get's pulled into assembly sources. Therefore, some includes need to b
 
 // -------------------- Co-routines  -----------------------
 
-#define configUSE_CO_ROUTINES                           0
+#define configUSE_CO_ROUTINES                           0 // CO_ROUTINES are not supported in ESP-IDF
 #define configMAX_CO_ROUTINE_PRIORITIES                 2
 
 // ------------------- Software Timer ----------------------