Merge branch 'refactor/freertos_config_files' into 'master'

FreeRTOS: Combine FreeRTOSConfig.h Closes IDF-6082 See merge request espressif/esp-idf!22815
espressif · Mar 22, 2023 · c71025d · c71025d
2 parents 2b895ef + 54deed0
commit c71025d
Show file tree

Hide file tree

Showing 15 changed files with 406 additions and 880 deletions.
diff --git a/components/freertos/CMakeLists.txt b/components/freertos/CMakeLists.txt
@@ -33,10 +33,11 @@ set(srcs
 
 set(include_dirs
     "${kernel_dir}/include" # FreeRTOS headers via #include "freertos/xxx.h"
-    "${kernel_dir}/portable/${arch}/include" # For arch-specific FreeRTOSConfig_arch.h in portable/<arch>/include
+    "${kernel_dir}/portable/${arch}/include" # For arch-specific #include "freertos/portmacro.h"
     "esp_additions/include/freertos"         # For files with #include "FreeRTOSConfig.h"
-    "esp_additions/include")                 # For files with #include "freertos/FreeRTOSConfig.h"
+    "esp_additions/include"                  # For files with #include "freertos/FreeRTOSConfig.h"
                                              #      or #include "freertos/task_snapshot.h"
+    "esp_additions/arch/${arch}/include")    # For #include "freertos/FreeRTOSConfig_arch.h"
 
 set(private_include_dirs
     "${kernel_dir}/portable/${arch}/include/freertos"

diff --git a/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/include/freertos/FreeRTOSConfig_smp.h b/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/include/freertos/FreeRTOSConfig_smp.h
diff --git a/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/include/freertos/portmacro.h b/components/freertos/FreeRTOS-Kernel-SMP/portable/riscv/include/freertos/portmacro.h
@@ -205,7 +205,7 @@ extern void vTaskExitCritical( void );
 #define portALT_GET_RUN_TIME_COUNTER_VALUE(x)       do {x = (uint32_t)esp_timer_get_time();} while(0)
 #endif
 
-// ------------------- TCB Cleanup ----------------------
+// --------------------- TCB Cleanup -----------------------
 
 #define portCLEAN_UP_TCB( pxTCB )                   vPortCleanUpTCB( pxTCB )
 
@@ -315,7 +315,7 @@ bool xPortcheckValidStackMem(const void *ptr);
 
 /* ------------------------------------------------------ Misc ---------------------------------------------------------
  * - Miscellaneous porting macros
- * - These are not port of the FreeRTOS porting interface, but are used by other FreeRTOS dependent components
+ * - These are not part of the FreeRTOS porting interface, but are used by other FreeRTOS dependent components
  * ------------------------------------------------------------------------------------------------------------------ */
 
 // --------------------- App-Trace -------------------------