eaw/esp-idf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/move_target_kconfig_2' into 'master'

Browse Source 
system: move kconfig options out of target component

See merge request espressif/esp-idf!17321
This commit is contained in:
Marius Vikhammer
2022-04-24 13:29:43 +08:00
parent 5bb2379bac d2872095f9
commit 45c1d1cba2
174 changed files with 1455 additions and 1723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
examples/system/deep_sleep/sdkconfig.ci.esp32_singlecore
View File

@@ -8,11 +8,10 @@ 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_HRT=y
CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=80
CONFIG_ULP_COPROC_ENABLED=y
CONFIG_ULP_COPROC_RESERVE_MEM=512
CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
CONFIG_RTC_CLK_SRC_INT_RC=y
CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y

24
examples/system/deep_sleep/sdkconfig.ci.generic
View File

@@ -3,21 +3,9 @@ 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_HRT=y
CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y
# 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
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=80
CONFIG_ULP_COPROC_ENABLED=y
CONFIG_ULP_COPROC_RESERVE_MEM=512
CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
CONFIG_RTC_CLK_SRC_INT_RC=y

12
examples/system/deep_sleep/sdkconfig.defaults
View File

@@ -1,7 +1,7 @@
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_HRT=y
CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=80
CONFIG_ULP_COPROC_ENABLED=y
CONFIG_ULP_COPROC_RESERVE_MEM=512
CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y
CONFIG_RTC_CLK_SRC_INT_RC=y
CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y

6
examples/system/flash_suspend/main/app_main.c
View File

@@ -24,14 +24,10 @@
#define TIMER_RESOLUTION_HZ (1 * 1000 * 1000) // 1MHz resolution
#define TIMER_ALARM_PERIOD_S 1 // Alarm period 1s
#if CONFIG_IDF_TARGET_ESP32C3
#define CPU_FREQ_MHZ CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ
#endif
#define RECORD_TIME_PREPARE() uint32_t __t1, __t2
#define RECORD_TIME_START() do {__t1 = esp_cpu_get_ccount();} while(0)
#define RECORD_TIME_END(p_time) do{__t2 = esp_cpu_get_ccount(); p_time = (__t2 - __t1);} while(0)
#define GET_US_BY_CCOUNT(t) ((double)(t)/CPU_FREQ_MHZ)
#define GET_US_BY_CCOUNT(t) ((double)(t)/CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ)
const static char *TAG = "Example";
DRAM_ATTR static uint32_t s_t1;

4
examples/system/flash_suspend/sdkconfig.defaults.esp32c3
View File

@@ -1,2 +1,2 @@
CONFIG_ESP32C3_DEFAULT_CPU_FREQ_160=y
CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ=160
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=160

2
examples/system/light_sleep/sdkconfig.ci
View File

@@ -1 +1 @@
CONFIG_ESP32_DEFAULT_CPU_FREQ_80=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y

2
examples/system/light_sleep/sdkconfig.defaults
View File

@@ -1 +1 @@
CONFIG_ESP32_DEFAULT_CPU_FREQ_80=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y

4
examples/system/startup_time/sdkconfig.defaults
View File

@@ -17,3 +17,7 @@ CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
# note: the larger the application, the bigger the time saved by
# from this option
CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=y
# Setting option to zero is only recommended if not using sleep modes, or
# if you don't need accurate sleep times.
CONFIG_RTC_CLK_CAL_CYCLES=0

5
examples/system/startup_time/sdkconfig.defaults.esp32
View File

@@ -1,5 +0,0 @@
# Not calibrating RTC_SLOW_CLK saves a small amount of time during boot.
#
# Setting option to zero is only recommended if not using sleep modes, or
# if you don't need accurate sleep times.
CONFIG_ESP32_RTC_CLK_CAL_CYCLES=0

5
examples/system/startup_time/sdkconfig.defaults.esp32c2
View File

@@ -1,5 +0,0 @@
# Not calibrating RTC_SLOW_CLK saves a small amount of time during boot.
#
# Setting option to zero is only recommended if not using sleep modes, or
# if you don't need accurate sleep times.
CONFIG_ESP32C2_RTC_CLK_CAL_CYCLES=0

5
examples/system/startup_time/sdkconfig.defaults.esp32c3
View File

@@ -1,5 +0,0 @@
# Not calibrating RTC_SLOW_CLK saves a small amount of time during boot.
#
# Setting option to zero is only recommended if not using sleep modes, or
# if you don't need accurate sleep times.
CONFIG_ESP32C3_RTC_CLK_CAL_CYCLES=0

5
examples/system/startup_time/sdkconfig.defaults.esp32s2
View File

@@ -1,5 +0,0 @@
# Not calibrating RTC_SLOW_CLK saves a small amount of time during boot.
#
# Setting option to zero is only recommended if not using sleep modes, or
# if you don't need accurate sleep times.
CONFIG_ESP32S2_RTC_CLK_CAL_CYCLES=0

5
examples/system/startup_time/sdkconfig.defaults.esp32s3
View File

@@ -1,5 +0,0 @@
# Not calibrating RTC_SLOW_CLK saves a small amount of time during boot.
#
# Setting option to zero is only recommended if not using sleep modes, or
# if you don't need accurate sleep times.
CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=0