Merge branch 'bugfix/fix_none_iram_code_before_xip_psram' into 'master'

rtc: fixed non-iram rtc code in early stage on p4 leading xip_psram stuck

See merge request espressif/esp-idf!31742
This commit is contained in:
Armando (Dou Yiwen) 2024-06-26 20:47:10 +08:00
commit 7755ce186e
2 changed files with 4 additions and 1 deletions

View File

@ -21,6 +21,9 @@ entries:
rtc_time (noflash_text)
if SOC_PMU_SUPPORTED = y && SOC_LIGHT_SLEEP_SUPPORTED = y:
pmu_sleep (noflash)
if SPIRAM_FLASH_LOAD_TO_PSRAM = y:
pmu_init (noflash)
pmu_param (noflash)
if SOC_USB_SERIAL_JTAG_SUPPORTED = y:
sleep_console (noflash)
if IDF_TARGET_ESP32 = y || IDF_TARGET_ESP32S2 = y:

View File

@ -41,7 +41,7 @@ static void select_rtc_slow_clk(soc_rtc_slow_clk_src_t rtc_slow_clk_src);
static const char *TAG = "clk";
void esp_rtc_init(void)
void IRAM_ATTR esp_rtc_init(void)
{
#if SOC_PMU_SUPPORTED
pmu_init();