sleep: keep RTC_SLOW_MEM powered on if RTC_NOINIT is used

Fixes a bug that if application uses RTC_NOINIT variables but doesn’t
use RTC_DATA variables, then RTC_NOINIT variables loose their values
after deep sleep.

Reported in https://esp32.com/viewtopic.php?f=2&t=7045&p=30301#p30299

diff --git a/components/esp32/sleep_modes.c b/components/esp32/sleep_modes.c
index f25a28443a4d54c67b938134d4a581fc7074939f..e770145a52812c9299c3cf60b3cce3348c414a95 100644 (file)
--- a/components/esp32/sleep_modes.c
+++ b/components/esp32/sleep_modes.c
@@ -603,11 +603,15 @@ static uint32_t get_power_down_flags()
     // RTC_SLOW_MEM is Auto, keep it powered up as well.
 
     // These labels are defined in the linker script:
-    extern int _rtc_data_start, _rtc_data_end, _rtc_bss_start, _rtc_bss_end;
+    extern int _rtc_data_start, _rtc_data_end,
+               _rtc_bss_start, _rtc_bss_end,
+               _rtc_noinit_start, _rtc_noinit_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 ||
-            (s_config.wakeup_triggers & RTC_ULP_TRIG_EN))) {
+            (&_rtc_data_end > &_rtc_data_start ||
+             &_rtc_bss_end > &_rtc_bss_start ||
+             &_rtc_noinit_end > &_rtc_noinit_start ||
+             (s_config.wakeup_triggers & RTC_ULP_TRIG_EN))) {
         s_config.pd_options[ESP_PD_DOMAIN_RTC_SLOW_MEM] = ESP_PD_OPTION_ON;
     }