freertos: updated the location of FreeRTOSConfig.h

Moved FreeRTOSConfig.h from include/freertos to include/esp_additions/freertos.
Updated FreeRTOS.h file to include FreeRTOSConfig.h without the
freertos/ prefix to match with the upstream file.
Renamed architecture specific FreeRTOSConfig.h files to FreeRTOSConfig_arch.h

Signed-off-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>

components/freertos/CMakeLists.txt

@@ -18,7 +18,9 @@ if(CONFIG_IDF_TARGET_ARCH_XTENSA)
 
     set(include_dirs
         include
-        port/xtensa/include)
+        include/esp_additions/freertos  # For files with #include "FreeRTOSConfig.h"
+        port/xtensa/include             # For including arch-specific FreeRTOSConfig_arch.h in port/<arch>/include
+        include/esp_additions)          # For files with #include "freertos/FreeRTOSConfig.h"
 
     set(private_include_dirs
         port/xtensa/include/freertos
@@ -33,7 +35,9 @@ elseif(CONFIG_IDF_TARGET_ARCH_RISCV)
 
     set(include_dirs
         include
-        port/riscv/include)
+        include/esp_additions/freertos  # For files with #include "FreeRTOSConfig.h"
+        port/riscv/include              # For including arch-specific FreeRTOSConfig_arch.h in port/<arch>/include
+        include/esp_additions)          # For files with #include "freertos/FreeRTOSConfig.h"
 
     set(private_include_dirs
         port/riscv/include/freertos
@@ -57,9 +61,6 @@ list(APPEND srcs
     "FreeRTOS-openocd.c"
     "freertos_v8_compat.c")
 
-list(APPEND include_dirs
-    "include/esp_additions")
-
 list(APPEND private_include_dirs
     "include/freertos")
 

components/freertos/component.mk

@@ -6,8 +6,8 @@ ifdef CONFIG_FREERTOS_DEBUG_OCDAWARE
 	COMPONENT_ADD_LDFLAGS += -Wl,--undefined=uxTopUsedPriority
 endif
 
-COMPONENT_ADD_INCLUDEDIRS := include port/xtensa/include include/esp_additions
-COMPONENT_PRIV_INCLUDEDIRS := include/freertos port/xtensa/include/freertos port/xtensa port/priv_include .
+COMPONENT_ADD_INCLUDEDIRS := include include/esp_additions include/esp_additions/freertos port/xtensa/include
+COMPONENT_PRIV_INCLUDEDIRS := include/esp_additions include/esp_additions/freertos include/freertos port/xtensa/include/freertos port/xtensa port/priv_include .
 COMPONENT_SRCDIRS += port port/xtensa esp_additions/
 
 ifndef CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY

components/freertos/include/esp_additions/freertos/FreeRTOSConfig.h

@@ -75,8 +75,8 @@
 /* for likely and unlikely */
 #include "esp_compiler.h"
 
-// The arch-specific FreeRTOSConfig.h in port/<arch>/include.
-#include_next "freertos/FreeRTOSConfig.h"
+// The arch-specific FreeRTOSConfig_arch.h in port/<arch>/include.
+#include "freertos/FreeRTOSConfig_arch.h"
 
 #if !(defined(FREERTOS_CONFIG_XTENSA_H) \
         || defined(FREERTOS_CONFIG_RISCV_H) \

components/freertos/include/freertos/FreeRTOS.h

@@ -54,7 +54,8 @@
 /* *INDENT-ON* */
 
 /* Application specific configuration options. */
-#include "freertos/FreeRTOSConfig.h"
+#include "FreeRTOSConfig.h"
+
 /* Basic FreeRTOS definitions. */
 #include "projdefs.h"