diff --git a/components/freertos/CMakeLists.txt b/components/freertos/CMakeLists.txt
index 3a477d6233..eea02bacd5 100644
--- a/components/freertos/CMakeLists.txt
+++ b/components/freertos/CMakeLists.txt
@@ -130,7 +130,9 @@ idf_component_get_property(COMPONENT_DIR freertos COMPONENT_DIR)
 idf_component_set_property(freertos ORIG_INCLUDE_PATH "${COMPONENT_DIR}/include/freertos/")
 
 if(CONFIG_FREERTOS_DEBUG_OCDAWARE)
-    target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=uxTopUsedPriority")
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=uxTopUsedPriority") #will be removed
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=FreeRTOS_openocd_params")
+    idf_build_set_property(COMPILE_OPTIONS "-DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1" APPEND)
 endif()
 
 set_source_files_properties(
diff --git a/components/freertos/FreeRTOS-openocd.c b/components/freertos/FreeRTOS-openocd.c
index a769b60b27..89e1374634 100644
--- a/components/freertos/FreeRTOS-openocd.c
+++ b/components/freertos/FreeRTOS-openocd.c
@@ -1,4 +1,9 @@
+
 /*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Since at least FreeRTOS V7.5.3 uxTopUsedPriority is no longer
  * present in the kernel, so it has to be supplied by other means for
  * OpenOCD's threads awareness.
@@ -20,5 +25,5 @@
 #endif
 
 #ifdef CONFIG_FREERTOS_DEBUG_OCDAWARE
-const int USED DRAM_ATTR uxTopUsedPriority = configMAX_PRIORITIES - 1;
+const int USED DRAM_ATTR uxTopUsedPriority = configMAX_PRIORITIES - 1;  //will be removed
 #endif
diff --git a/components/freertos/esp_additions/include/freertos_tasks_c_additions.h b/components/freertos/esp_additions/include/freertos_tasks_c_additions.h
index e000b5dcb6..1e742fd326 100644
--- a/components/freertos/esp_additions/include/freertos_tasks_c_additions.h
+++ b/components/freertos/esp_additions/include/freertos_tasks_c_additions.h
@@ -74,3 +74,35 @@
 	}
 
 #endif
+
+#if ( configENABLE_FREERTOS_DEBUG_OCDAWARE == 1 )
+
+/**
+ * Debug param indexes. DO NOT change the order. OpenOCD uses the same indexes
+ * Entries in FreeRTOS_openocd_params must match the order of these indexes
+ */
+enum {
+	ESP_FREERTOS_DEBUG_TABLE_SIZE = 0,
+	ESP_FREERTOS_DEBUG_TABLE_VERSION,
+	ESP_FREERTOS_DEBUG_KERNEL_VER_MAJOR,
+	ESP_FREERTOS_DEBUG_KERNEL_VER_MINOR,
+	ESP_FREERTOS_DEBUG_KERNEL_VER_BUILD,
+	ESP_FREERTOS_DEBUG_UX_TOP_USED_PIORITY,
+	ESP_FREERTOS_DEBUG_PX_TOP_OF_STACK,
+	ESP_FREERTOS_DEBUG_PC_TASK_NAME,
+	/* New entries must be inserted here */
+	ESP_FREERTOS_DEBUG_TABLE_END,
+};
+
+const DRAM_ATTR uint8_t FreeRTOS_openocd_params[ESP_FREERTOS_DEBUG_TABLE_END]  = {
+	ESP_FREERTOS_DEBUG_TABLE_END,	 /* table size */
+	1,								 /* table version */
+	tskKERNEL_VERSION_MAJOR,
+	tskKERNEL_VERSION_MINOR,
+	tskKERNEL_VERSION_BUILD,
+	configMAX_PRIORITIES - 1, 		 /* uxTopUsedPriority */
+	offsetof(TCB_t, pxTopOfStack),	 /* thread_stack_offset; */
+	offsetof(TCB_t, pcTaskName),	 /* thread_name_offset; */
+};
+
+#endif