From 37e8f1f348217d77b3dd19897d3284d3a6684cb6 Mon Sep 17 00:00:00 2001
From: Jakob Hasse <jakob.hasse@espressif.com>
Date: Fri, 14 Oct 2022 19:13:49 +0200
Subject: [PATCH] feat(freertos): added event group and stream buffer to linux
 target

---
 components/freertos/CMakeLists.txt                          | 6 ------
 .../portable/linux/include/freertos/portmacro_idf.h         | 1 +
 .../esp_additions/include/freertos/FreeRTOSConfig.h         | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/components/freertos/CMakeLists.txt b/components/freertos/CMakeLists.txt
index 161821d3792..e6cd2d99567 100644
--- 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
index c00c8c6d2e1..60ff5da2084 100644
--- 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
index 7d8e19f308f..4935d0cfd06 100644
--- 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 ----------------------