change(esp_hw_support): change for pmu build pass

This commit is contained in:
Li Shuai
2025-03-10 11:49:25 +08:00
committed by BOT
parent 1da425bdc7
commit 410fb091d9
6 changed files with 27 additions and 9 deletions

View File

@@ -33,11 +33,13 @@ if(NOT non_os_build)
"sar_periph_ctrl_common.c" "sar_periph_ctrl_common.c"
"port/${target}/io_mux.c" "port/${target}/io_mux.c"
"port/${target}/esp_clk_tree.c" "port/${target}/esp_clk_tree.c"
"port/esp_clk_tree_common.c"
"dma/esp_dma_utils.c" "dma/esp_dma_utils.c"
"dma/gdma_link.c" "dma/gdma_link.c"
"spi_bus_lock.c" "spi_bus_lock.c"
"clk_utils.c") "clk_utils.c")
if(CONFIG_SOC_CLK_TREE_SUPPORTED)
list(APPEND srcs "port/esp_clk_tree_common.c")
endif()
if(CONFIG_SOC_GPSPI_SUPPORTED) if(CONFIG_SOC_GPSPI_SUPPORTED)
list(APPEND srcs "spi_share_hw_ctrl.c") list(APPEND srcs "spi_share_hw_ctrl.c")
endif() endif()
@@ -58,7 +60,7 @@ if(NOT non_os_build)
"sleep_gpio.c" "sleep_gpio.c"
"sleep_event.c" "sleep_event.c"
) )
if(CONFIG_SOC_PAU_SUPPORTED) if(CONFIG_SOC_PAU_SUPPORTED AND CONFIG_SOC_PM_SUPPORT_TOP_PD)
list(APPEND srcs "sleep_system_peripheral.c") list(APPEND srcs "sleep_system_peripheral.c")
endif() endif()
endif() endif()

View File

@@ -1642,10 +1642,11 @@ esp_err_t esp_sleep_enable_ulp_wakeup(void)
esp_err_t esp_sleep_enable_timer_wakeup(uint64_t time_in_us) esp_err_t esp_sleep_enable_timer_wakeup(uint64_t time_in_us)
{ {
#if CONFIG_SOC_CLK_TREE_SUPPORTED
if (time_in_us > ((BIT64(SOC_LP_TIMER_BIT_WIDTH_LO + SOC_LP_TIMER_BIT_WIDTH_HI) - 1) / esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_APPROX)) * MHZ ) { if (time_in_us > ((BIT64(SOC_LP_TIMER_BIT_WIDTH_LO + SOC_LP_TIMER_BIT_WIDTH_HI) - 1) / esp_clk_tree_lp_slow_get_freq_hz(ESP_CLK_TREE_SRC_FREQ_PRECISION_APPROX)) * MHZ ) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
#endif
s_config.wakeup_triggers |= RTC_TIMER_TRIG_EN; s_config.wakeup_triggers |= RTC_TIMER_TRIG_EN;
s_config.sleep_duration = time_in_us; s_config.sleep_duration = time_in_us;
return ESP_OK; return ESP_OK;

View File

@@ -0,0 +1,19 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include "hal/lp_aon_ll.h"
#ifdef __cplusplus
extern "C" {
#endif
#define lp_aon_hal_inform_wakeup_type(dslp) lp_aon_ll_inform_wakeup_type(dslp)
#ifdef __cplusplus
}
#endif

View File

@@ -165,7 +165,7 @@ if(CONFIG_SOC_SDIO_SLAVE_SUPPORTED)
list(APPEND srcs "${target_folder}/sdio_slave_periph.c") list(APPEND srcs "${target_folder}/sdio_slave_periph.c")
endif() endif()
if(CONFIG_SOC_PAU_SUPPORTED AND CONFIG_SOC_LIGHT_SLEEP_SUPPORTED) if(CONFIG_SOC_PAU_SUPPORTED AND CONFIG_SOC_LIGHT_SLEEP_SUPPORTED AND CONFIG_SOC_PM_SUPPORT_TOP_PD)
list(APPEND srcs "${target_folder}/system_retention_periph.c") list(APPEND srcs "${target_folder}/system_retention_periph.c")
endif() endif()

View File

@@ -779,10 +779,6 @@ config SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY
bool bool
default y default y
config SOC_CLK_RC_FAST_SUPPORT_CALIBRATION
bool
default y
config SOC_CLK_XTAL32K_SUPPORTED config SOC_CLK_XTAL32K_SUPPORTED
bool bool
default y default y

View File

@@ -538,7 +538,7 @@
#define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY (1) /*!<Supports CRC only the stub code in RTC memory */ #define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY (1) /*!<Supports CRC only the stub code in RTC memory */
/*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/ /*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/
#define SOC_CLK_RC_FAST_SUPPORT_CALIBRATION (1) // #define SOC_CLK_RC_FAST_SUPPORT_CALIBRATION (1)
#define SOC_CLK_XTAL32K_SUPPORTED (1) /*!< Support to connect an external low frequency crystal */ #define SOC_CLK_XTAL32K_SUPPORTED (1) /*!< Support to connect an external low frequency crystal */
#define SOC_CLK_OSC_SLOW_SUPPORTED (1) /*!< Support to connect an external oscillator, not a crystal */ #define SOC_CLK_OSC_SLOW_SUPPORTED (1) /*!< Support to connect an external oscillator, not a crystal */