From 3053119f609644f2345ccb8efdfddb0dcc20a77c Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 20 Mar 2020 14:50:00 +0100 Subject: [PATCH 1/2] ci: consider sdkconfig.defaults.TARGET_NAME in examples and test apps --- tools/find_build_apps/cmake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/find_build_apps/cmake.py b/tools/find_build_apps/cmake.py index 8668eb218..b82e6b999 100644 --- a/tools/find_build_apps/cmake.py +++ b/tools/find_build_apps/cmake.py @@ -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) From bfefee3205d38e715952ed03170fddda0ff61ea0 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 20 Mar 2020 15:12:52 +0100 Subject: [PATCH 2/2] examples: set correct CPU frequency in ethernet/iperf for ESP32-S2 --- examples/ethernet/iperf/sdkconfig.defaults | 4 ---- examples/ethernet/iperf/sdkconfig.defaults.esp32 | 2 ++ examples/ethernet/iperf/sdkconfig.defaults.esp32s2 | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 examples/ethernet/iperf/sdkconfig.defaults.esp32 create mode 100644 examples/ethernet/iperf/sdkconfig.defaults.esp32s2 diff --git a/examples/ethernet/iperf/sdkconfig.defaults b/examples/ethernet/iperf/sdkconfig.defaults index 353d4cce4..9ef48f281 100644 --- a/examples/ethernet/iperf/sdkconfig.defaults +++ b/examples/ethernet/iperf/sdkconfig.defaults @@ -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 diff --git a/examples/ethernet/iperf/sdkconfig.defaults.esp32 b/examples/ethernet/iperf/sdkconfig.defaults.esp32 new file mode 100644 index 000000000..edc45ae61 --- /dev/null +++ b/examples/ethernet/iperf/sdkconfig.defaults.esp32 @@ -0,0 +1,2 @@ +# ESP32-specific +CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y diff --git a/examples/ethernet/iperf/sdkconfig.defaults.esp32s2 b/examples/ethernet/iperf/sdkconfig.defaults.esp32s2 new file mode 100644 index 000000000..5ba18ce95 --- /dev/null +++ b/examples/ethernet/iperf/sdkconfig.defaults.esp32s2 @@ -0,0 +1,2 @@ +# ESP32-S2-specific +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y