kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/ci_example_target_specific_defaults' into 'master'
ci: consider sdkconfig.defaults.TARGET_NAME in examples and test apps See merge request espressif/esp-idf!8061pull/5000/head
commit
286538e7af
|
@ -12,8 +12,4 @@ CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=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
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
# ESP32-specific
|
||||
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
|
|
@ -0,0 +1,2 @@
|
|||
# ESP32-S2-specific
|
||||
CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y
|
|
@ -53,7 +53,7 @@ class CMakeBuildSystem(BuildSystem):
|
|||
# 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
|
||||
# sdkconfig files.
|
||||
sdkconfig_defaults_list = ["sdkconfig.defaults"]
|
||||
sdkconfig_defaults_list = ["sdkconfig.defaults", "sdkconfig.defaults." + build_item.target]
|
||||
if build_item.sdkconfig_path:
|
||||
sdkconfig_defaults_list.append(build_item.sdkconfig_path)
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue