ci(esp32c5): fix the build of the template app

pull/12800/head
laokaiyao 2024-01-30 14:19:54 +08:00
rodzic c0c6af99e9
commit ea14b24048
6 zmienionych plików z 20 dodań i 32 usunięć

Wyświetl plik

@ -9,7 +9,8 @@
extra_default_build_targets:
- esp32p4
# bypass_check_test_targets:
bypass_check_test_targets:
- esp32c5
# - esp32p4
#
# These lines would

Wyświetl plik

@ -9,4 +9,5 @@ entries:
[mapping:ledc_hal]
archive: libhal.a
entries:
ledc_hal_iram (noflash)
if SOC_LEDC_SUPPORTED = y:
ledc_hal_iram (noflash)

Wyświetl plik

@ -13,13 +13,26 @@
#include "soc/soc_caps.h"
#if SOC_PMU_SUPPORTED
#include "hal/pmu_hal.h"
#include "pmu_param.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief PMU ICG modem code of HP system
* @note This type is required in rtc_clk_init.c when PMU not fully supported
*/
typedef enum {
PMU_HP_ICG_MODEM_CODE_SLEEP = 0,
PMU_HP_ICG_MODEM_CODE_MODEM = 1,
PMU_HP_ICG_MODEM_CODE_ACTIVE = 2,
} pmu_hp_icg_modem_mode_t;
#if SOC_PMU_SUPPORTED
#include "hal/pmu_hal.h"
#include "pmu_param.h"
#define RTC_SLEEP_PD_DIG PMU_SLEEP_PD_TOP //!< Deep sleep (power down digital domain, includes all power domains
// except CPU, Modem, LP peripheral, AONVDDSDIO, MEM and clock power domains)
@ -145,12 +158,6 @@ extern "C" {
#define PMU_SLEEP_PD_RC32K BIT(13)
#define PMU_SLEEP_PD_LP_PERIPH BIT(14)
/**
* This macro only used for detecting whether the enums are declared
* So that to avoid use the enum when PMU is not supported
*/
#define ESP_PMU_ENUMS_DECLARED
typedef struct {
pmu_hal_context_t *hal;
void *mc;
@ -179,16 +186,6 @@ typedef enum pmu_sleep_regdma_entry {
PMU_SLEEP_REGDMA_ENTRY_MAX
} pmu_sleep_regdma_entry_t;
/**
* @brief PMU ICG modem code of HP system
*/
typedef enum {
PMU_HP_ICG_MODEM_CODE_SLEEP = 0,
PMU_HP_ICG_MODEM_CODE_MODEM = 1,
PMU_HP_ICG_MODEM_CODE_ACTIVE = 2,
} pmu_hp_icg_modem_mode_t;
/**
* @brief Enable_regdma_backup.
*/

Wyświetl plik

@ -18,7 +18,7 @@ entries:
if SOC_CONFIGURABLE_VDDSDIO_SUPPORTED = y:
rtc_init:rtc_vddsdio_get_config (noflash)
rtc_init:rtc_vddsdio_set_config (noflash)
if IDF_TARGET_ESP32C6 = n && IDF_TARGET_ESP32H2 = n && IDF_TARGET_ESP32P4 = n: # TODO: IDF-5645
if SOC_PMU_SUPPORTED = n:
rtc_sleep (noflash_text)
rtc_time (noflash_text)
if SOC_PMU_SUPPORTED = y:

Wyświetl plik

@ -41,10 +41,6 @@ static const char *TAG = "rtc_clk_init";
*/
static void rtc_clk_modem_clock_domain_active_state_icg_map_preinit(void)
{
// If PMU has not supported yet, the enum has not declared, use macro instead
#ifndef ESP_PMU_ENUMS_DECLARED
#define PMU_HP_ICG_MODEM_CODE_ACTIVE 2
#endif
/* Configure modem ICG code in PMU_ACTIVE state */
pmu_ll_hp_set_icg_modem(&PMU, PMU_MODE_HP_ACTIVE, PMU_HP_ICG_MODEM_CODE_ACTIVE);
@ -56,9 +52,6 @@ static void rtc_clk_modem_clock_domain_active_state_icg_map_preinit(void)
/* Software trigger force update modem ICG code and ICG switch */
pmu_ll_imm_update_dig_icg_modem_code(&PMU, true);
pmu_ll_imm_update_dig_icg_switch(&PMU, true);
#ifndef ESP_PMU_ENUMS_DECLARED
#undef PMU_HP_ICG_MODEM_CODE_ACTIVE
#endif
}

Wyświetl plik

@ -9,7 +9,3 @@ examples/get-started/blink:
examples/get-started/hello_world:
enable:
- if: INCLUDE_DEFAULT == 1 or IDF_TARGET in ["linux", "esp32c5"]
disable_test:
- if: IDF_TARGET == "esp32c5"
temporary: true
reason: lack of runner