espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-06 06:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ci_example_target_specific_defaults' into 'master'

Browse Source 
ci: consider sdkconfig.defaults.TARGET_NAME in examples and test apps

See merge request espressif/esp-idf!8061
This commit is contained in:
Ivan Grokhotkov
2020-03-23 15:48:15 +08:00
parent 62b40284a1 bfefee3205
commit 286538e7af
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/ethernet/iperf/sdkconfig.defaults
View File

@@ -12,8 +12,4 @@ CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
# ESP32-specific
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER=n CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER=n

2
examples/ethernet/iperf/sdkconfig.defaults.esp32 Normal file
View File

@@ -0,0 +1,2 @@
# ESP32-specific
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y

2
examples/ethernet/iperf/sdkconfig.defaults.esp32s2 Normal file
View File

@@ -0,0 +1,2 @@
# ESP32-S2-specific
CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y

2
tools/find_build_apps/cmake.py
View File

@@ -53,7 +53,7 @@ class CMakeBuildSystem(BuildSystem):
# Note: the build system supports taking multiple sdkconfig.defaults files via SDKCONFIG_DEFAULTS # Note: the build system supports taking multiple sdkconfig.defaults files via SDKCONFIG_DEFAULTS
# CMake variable. However here we do this manually to perform environment variable expansion in the # CMake variable. However here we do this manually to perform environment variable expansion in the
# sdkconfig files. # sdkconfig files.
sdkconfig_defaults_list = ["sdkconfig.defaults"] sdkconfig_defaults_list = ["sdkconfig.defaults", "sdkconfig.defaults." + build_item.target]
if build_item.sdkconfig_path: if build_item.sdkconfig_path:
sdkconfig_defaults_list.append(build_item.sdkconfig_path) sdkconfig_defaults_list.append(build_item.sdkconfig_path)