From 7f0fc3a37b70201feed3d7a4d5ab511566b51c2b Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 17 Feb 2021 14:43:53 +1100 Subject: [PATCH] ci: Consolidate deep sleep example test configs --- examples/system/deep_sleep/sdkconfig.ci | 20 ++++++++++++++++--- .../deep_sleep/sdkconfig.ci.esp32_singlecore | 18 +++++++++++++++++ tools/test_apps/README.md | 8 +++++--- 3 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore diff --git a/examples/system/deep_sleep/sdkconfig.ci b/examples/system/deep_sleep/sdkconfig.ci index 684e6d0e0e..270d497543 100644 --- a/examples/system/deep_sleep/sdkconfig.ci +++ b/examples/system/deep_sleep/sdkconfig.ci @@ -1,12 +1,26 @@ +# Generic config +CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y +CONFIG_EXAMPLE_ULP_TEMPERATURE_WAKEUP=n +CONFIG_EXAMPLE_EXT1_WAKEUP=n + +# ESP32-specific config CONFIG_ESP32_DEFAULT_CPU_FREQ_80=y CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=80 CONFIG_ESP32_ULP_COPROC_ENABLED=y CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=512 CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y -CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y -CONFIG_EXAMPLE_ULP_TEMPERATURE_WAKEUP=n -CONFIG_EXAMPLE_EXT1_WAKEUP=n + +# ESP32S2-specific config +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_80=y +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ=80 +CONFIG_ESP32S2_ULP_COPROC_ENABLED=y +CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=512 +CONFIG_ESP32S2_RTC_CLK_SRC_INT_RC=y + +# ESP32C3-specific config +CONFIG_ESP32C3_DEFAULT_CPU_FREQ_80=y +CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ=80 # IDF-3090 CONFIG_ESP32C3_REV_MIN_0=y CONFIG_ESP32C3_REV_MIN=0 diff --git a/examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore b/examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore new file mode 100644 index 0000000000..8a85b57599 --- /dev/null +++ b/examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore @@ -0,0 +1,18 @@ +CONFIG_IDF_TARGET="esp32" +CONFIG_FREERTOS_UNICORE=y + +## Below here should be same as these sections in sdkconfig.ci + +# Generic config +CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y +CONFIG_EXAMPLE_ULP_TEMPERATURE_WAKEUP=n +CONFIG_EXAMPLE_EXT1_WAKEUP=n + +# ESP32-specific config +CONFIG_ESP32_DEFAULT_CPU_FREQ_80=y +CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=80 +CONFIG_ESP32_ULP_COPROC_ENABLED=y +CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=512 +CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y +CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y +CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y diff --git a/tools/test_apps/README.md b/tools/test_apps/README.md index 3f5aa3e421..2f77f0d87d 100644 --- a/tools/test_apps/README.md +++ b/tools/test_apps/README.md @@ -22,10 +22,12 @@ Test applications are treated the same way as ESP-IDF examples, so each project For each project in test_apps (and also examples): -* If a file `sdkconfig.ci` exists then it's built as the `default` CI config (same as if this file was named `sdkconfig.ci.default`) -* If any files `sdkconfig.ci.` exist then these are built as alternative configs, with the specified `` name. +* If a file `sdkconfig.ci` exists then it's built as the `default` CI config. +* If any additional files `sdkconfig.ci.` exist then these are built as alternative configs, with the specified `` name. -* By default, every CI configurations is built for every target SoC (an `m * n` configuration matrix). However if any `sdkconfig.ci` file contains a line of the form `CONFIG_IDF_TARGET="targetname"` then that CI config is only built for that one target. +The CI system expects to see at least a "default" config, so add `sdkconfig.ci` before adding any `sdkconfig.ci.CONFIG` files. + +* By default, every CI configurations is built for every target SoC (an `m * n` configuration matrix). However if any `sdkconfig.ci.*` file contains a line of the form `CONFIG_IDF_TARGET="targetname"` then that CI config is only built for that one target. This only works in `sdkconfig.ci.CONFIG`, not in the default `sdkconfig.ci`. * Each configuration is also built with the contents of any `sdkconfig.defaults` file or a file named `sdkconfig.defaults.` appended. (Same as a normal ESP-IDF project build.) ## Test Execution