Merge branch 'feature/freertos_vtasklist_include_coreid' into 'master'

freertos-smp: Made CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID available only for IDF-FreeRTOS

Closes IDF-5295

See merge request espressif/esp-idf!21291

components/freertos/Kconfig

@@ -217,9 +217,9 @@ menu "FreeRTOS"
                 configUSE_STATS_FORMATTING_FUNCTIONS documentation for more details).
 
         config FREERTOS_VTASKLIST_INCLUDE_COREID
-            # Todo: Remove this once core affinity in stats is supported in SMP FreeRTOS (IDF-4986)
+            # Core affinity is supported in stats for Amazon FreeRTOS SMP by default
             bool "Enable display of xCoreID in vTaskList"
-            depends on FREERTOS_USE_STATS_FORMATTING_FUNCTIONS
+            depends on !FREERTOS_SMP && FREERTOS_USE_STATS_FORMATTING_FUNCTIONS
             default n
             help
                 If enabled, this will include an extra column when vTaskList is called to display the CoreID the task