Merge branch 'refactor/remove_toolchain_prefix_in_kconfig' into 'master'

cmake: using toolchain prefix determined by cmake itself

See merge request espressif/esp-idf!16703

Kconfig

@@ -105,18 +105,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
         default 0xFFFF
 
     menu "SDK tool configuration"
-        config SDK_TOOLPREFIX
-            string "Compiler toolchain path/prefix"
-            default "xtensa-esp32-elf-" if IDF_TARGET_ESP32
-            default "xtensa-esp32s2-elf-" if IDF_TARGET_ESP32S2
-            default "xtensa-esp32s3-elf-" if IDF_TARGET_ESP32S3
-            default "riscv32-esp-elf-" if IDF_TARGET_ESP32C3
-            default "riscv32-esp-elf-" if IDF_TARGET_ESP32H2
-            default "riscv32-esp-elf-" if IDF_TARGET_ESP8684
-
-            help
-                The prefix/path that is used to call the toolchain. The default setting assumes
-                a crosstool-ng gcc setup that is in your PATH.
 
         config SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS
             bool "Toolchain supports time_t wide 64-bits"

components/app_trace/project_include.cmake

@@ -2,7 +2,7 @@
 #
 # Create coverage report.
 function(idf_create_coverage_report report_dir)
-    set(gcov_tool ${CONFIG_SDK_TOOLPREFIX}gcov)
+    set(gcov_tool ${_CMAKE_TOOLCHAIN_PREFIX}gcov)
     idf_build_get_property(project_name PROJECT_NAME)
 
     add_custom_target(pre-cov-report

sdkconfig.rename

@@ -1,9 +1,6 @@
 # sdkconfig replacement configurations for deprecated options formatted as
 # CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
 
-# SDK tool configuration
-CONFIG_TOOLPREFIX                      CONFIG_SDK_TOOLPREFIX
-
 # Compiler options
 CONFIG_OPTIMIZATION_COMPILER                  CONFIG_COMPILER_OPTIMIZATION
 CONFIG_OPTIMIZATION_LEVEL_DEBUG               CONFIG_COMPILER_OPTIMIZATION_DEFAULT

tools/cmake/project_description.json.in

@@ -11,7 +11,7 @@
     "rev":                "${CONFIG_ESP32_REV_MIN}",
     "phy_data_partition": "${CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION}",
     "monitor_baud" :      "${CONFIG_ESPTOOLPY_MONITOR_BAUD}",
-    "monitor_toolprefix": "${CONFIG_SDK_TOOLPREFIX}",
+    "monitor_toolprefix": "${_CMAKE_TOOLCHAIN_PREFIX}",
     "config_environment" : {
         "COMPONENT_KCONFIGS" : "${COMPONENT_KCONFIGS}",
         "COMPONENT_KCONFIGS_PROJBUILD" : "${COMPONENT_KCONFIGS_PROJBUILD}"

tools/test_apps/build_system/ldalign_test/CMakeLists.txt

@@ -9,7 +9,7 @@ idf_build_get_property(python PYTHON)
 idf_build_get_property(elf EXECUTABLE)
 
 set(check_alignment  "${CMAKE_CURRENT_LIST_DIR}/check_alignment.py")
-set(readelf "${CMAKE_TOOLCHAIN_PREFIX}readelf")
+set(readelf "${_CMAKE_TOOLCHAIN_PREFIX}readelf")
 
 add_custom_command(
     TARGET ${elf}