Merge branch 'bugfix/get_power_down_flags' into 'master'

sleep_mode/esp32: Fix a condition to keep power domain enabled during sleep mode

See merge request idf/esp-idf!2515
This commit is contained in:
Ivan Grokhotkov 2018-06-07 20:20:13 +08:00
commit 705d42dd18

View file

@ -599,9 +599,9 @@ static uint32_t get_power_down_flags()
// These labels are defined in the linker script:
extern int _rtc_data_start, _rtc_data_end, _rtc_bss_start, _rtc_bss_end;
if (s_config.pd_options[ESP_PD_DOMAIN_RTC_SLOW_MEM] == ESP_PD_OPTION_AUTO ||
&_rtc_data_end > &_rtc_data_start ||
&_rtc_bss_end > &_rtc_bss_start) {
if ((s_config.pd_options[ESP_PD_DOMAIN_RTC_SLOW_MEM] == ESP_PD_OPTION_AUTO) &&
(&_rtc_data_end > &_rtc_data_start || &_rtc_bss_end > &_rtc_bss_start ||
(s_config.wakeup_triggers & RTC_ULP_TRIG_EN))) {
s_config.pd_options[ESP_PD_DOMAIN_RTC_SLOW_MEM] = ESP_PD_OPTION_ON;
}