feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

esp32c2: fix soc_caps defines

Browse Source
This commit is contained in:
wuzhenghui
2022-04-08 16:22:15 +08:00
parent d91ccbc346
commit b530632f33
4 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_system/port/soc/esp32c2/CMakeLists.txt
View File

@@ -2,7 +2,6 @@ set(srcs "clk.c"
"reset_reason.c" "reset_reason.c"
"system_internal.c" "system_internal.c"
"cache_err_int.c" "cache_err_int.c"
"apb_backup_dma.c"
"../../arch/riscv/expression_with_stack.c" "../../arch/riscv/expression_with_stack.c"
"../../arch/riscv/expression_with_stack_asm.S" "../../arch/riscv/expression_with_stack_asm.S"
"../../arch/riscv/panic_arch.c") "../../arch/riscv/panic_arch.c")

37
components/esp_system/port/soc/esp32c2/apb_backup_dma.c
View File

@@ -1,37 +0,0 @@
/*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include "soc/soc_caps.h"
#include "esp_attr.h"
#include "freertos/FreeRTOS.h"
#include "freertos/portmacro.h"
#include "esp32c2/rom/apb_backup_dma.h"
static portMUX_TYPE s_apb_backup_dma_mutex = portMUX_INITIALIZER_UNLOCKED;
static void IRAM_ATTR apb_backup_dma_lock(void)
{
if (xPortInIsrContext()) {
portENTER_CRITICAL_ISR(&s_apb_backup_dma_mutex);
} else {
portENTER_CRITICAL(&s_apb_backup_dma_mutex);
}
}
static void IRAM_ATTR apb_backup_dma_unlock(void)
{
if (xPortInIsrContext()) {
portEXIT_CRITICAL_ISR(&s_apb_backup_dma_mutex);
} else {
portEXIT_CRITICAL(&s_apb_backup_dma_mutex);
}
}
void esp_apb_backup_dma_lock_init(void)
{
ets_apb_backup_init_lock_func(apb_backup_dma_lock, apb_backup_dma_unlock);
}

8
components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
View File

@@ -123,10 +123,6 @@ config SOC_ADC_MAX_BITWIDTH
int int
default 12 default 12
config SOC_APB_BACKUP_DMA
bool
default y
config SOC_BROWNOUT_RESET_SUPPORTED config SOC_BROWNOUT_RESET_SUPPORTED
bool bool
default y default y
@@ -452,8 +448,8 @@ config SOC_SECURE_BOOT_V2_ECC
default y default y
config SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS config SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS
bool int
default y default 1
config SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX config SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX
int int

5
components/soc/esp32c2/include/soc/soc_caps.h
View File

@@ -66,9 +66,6 @@
/*!< RTC */ /*!< RTC */
#define SOC_ADC_MAX_BITWIDTH (12) #define SOC_ADC_MAX_BITWIDTH (12)
/*-------------------------- APB BACKUP DMA CAPS -------------------------------*/
#define SOC_APB_BACKUP_DMA (1)
/*-------------------------- BROWNOUT CAPS -----------------------------------*/ /*-------------------------- BROWNOUT CAPS -----------------------------------*/
#define SOC_BROWNOUT_RESET_SUPPORTED 1 #define SOC_BROWNOUT_RESET_SUPPORTED 1
@@ -231,7 +228,7 @@
/*-------------------------- Secure Boot CAPS----------------------------*/ /*-------------------------- Secure Boot CAPS----------------------------*/
#define SOC_SECURE_BOOT_V2_ECC 1 #define SOC_SECURE_BOOT_V2_ECC 1
#define SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS 1 #define SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS (1U)
/*-------------------------- Flash Encryption CAPS----------------------------*/ /*-------------------------- Flash Encryption CAPS----------------------------*/
#define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (32) #define SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX (32)