From 142e49f4cc2f3a0fdd3f69bb7e897dcf85ce0168 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 10 Sep 2019 15:23:30 +0200 Subject: [PATCH] unit-test-app: fix chip-specific sdkconfig options DEFAULT_CPU_FREQ and ULP_COPROC_ENABLED options have chip-specific names, and should be set in a chip-specific sdkconfig.defaults file. This commit also changes the default CPU frequency for ESP32S2 unit tests to 240 MHz. --- tools/unit-test-app/sdkconfig.defaults | 3 --- tools/unit-test-app/sdkconfig.defaults.esp32 | 3 +++ tools/unit-test-app/sdkconfig.defaults.esp32s2beta | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 tools/unit-test-app/sdkconfig.defaults.esp32 diff --git a/tools/unit-test-app/sdkconfig.defaults b/tools/unit-test-app/sdkconfig.defaults index 947c23287..7cee27db6 100644 --- a/tools/unit-test-app/sdkconfig.defaults +++ b/tools/unit-test-app/sdkconfig.defaults @@ -6,8 +6,6 @@ CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table_unit_test_app.csv" CONFIG_PARTITION_TABLE_FILENAME="partition_table_unit_test_app.csv" CONFIG_PARTITION_TABLE_OFFSET=0x8000 -CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 @@ -17,7 +15,6 @@ CONFIG_MBEDTLS_HARDWARE_MPI=y CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y CONFIG_MBEDTLS_HARDWARE_SHA=y CONFIG_SPI_FLASH_ENABLE_COUNTERS=y -CONFIG_ESP32_ULP_COPROC_ENABLED=y CONFIG_ESP_TASK_WDT=n CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS=y CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=7 diff --git a/tools/unit-test-app/sdkconfig.defaults.esp32 b/tools/unit-test-app/sdkconfig.defaults.esp32 new file mode 100644 index 000000000..1087b70b0 --- /dev/null +++ b/tools/unit-test-app/sdkconfig.defaults.esp32 @@ -0,0 +1,3 @@ +CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32_XTAL_FREQ_AUTO=y +CONFIG_ESP32_ULP_COPROC_ENABLED=y diff --git a/tools/unit-test-app/sdkconfig.defaults.esp32s2beta b/tools/unit-test-app/sdkconfig.defaults.esp32s2beta index e8620adfc..74f96509f 100644 --- a/tools/unit-test-app/sdkconfig.defaults.esp32s2beta +++ b/tools/unit-test-app/sdkconfig.defaults.esp32s2beta @@ -1 +1,5 @@ +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32S2_ULP_COPROC_ENABLED=y + +# Hardware MPI disabled, ref. IDF-757 CONFIG_MBEDTLS_HARDWARE_MPI=n