From a8f6776b0f6c5de27d5385ab91d9b1d548a69faf Mon Sep 17 00:00:00 2001 From: morris Date: Wed, 27 Nov 2024 14:31:27 +0800 Subject: [PATCH] change(hal): remove unused sdkconfig.h --- components/hal/adc_hal_common.c | 1 - components/hal/efuse_hal.c | 1 - components/hal/esp32c2/efuse_hal.c | 1 - components/hal/esp32c3/efuse_hal.c | 1 - components/hal/esp32c61/include/hal/gdma_ll.h | 1 - components/hal/esp32p4/include/hal/assist_debug_ll.h | 4 ++-- components/hal/include/hal/pau_types.h | 1 - components/hal/include/hal/rtc_io_hal.h | 1 - components/hal/isp_hal.c | 1 - components/hal/lp_timer_hal.c | 1 - components/hal/spi_slave_hd_hal.c | 1 - 11 files changed, 2 insertions(+), 12 deletions(-) diff --git a/components/hal/adc_hal_common.c b/components/hal/adc_hal_common.c index e1d8a652f2..1a0cddc370 100644 --- a/components/hal/adc_hal_common.c +++ b/components/hal/adc_hal_common.c @@ -5,7 +5,6 @@ */ #include -#include "sdkconfig.h" #include "soc/soc_caps.h" #include "hal/adc_hal_common.h" #include "hal/adc_ll.h" diff --git a/components/hal/efuse_hal.c b/components/hal/efuse_hal.c index ae0a86de57..28cdaed788 100644 --- a/components/hal/efuse_hal.c +++ b/components/hal/efuse_hal.c @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "sdkconfig.h" #include #include "soc/soc_caps.h" #include "hal/efuse_ll.h" diff --git a/components/hal/esp32c2/efuse_hal.c b/components/hal/esp32c2/efuse_hal.c index 608f294040..ff76025c35 100644 --- a/components/hal/esp32c2/efuse_hal.c +++ b/components/hal/esp32c2/efuse_hal.c @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "sdkconfig.h" #include #include "soc/soc_caps.h" #include "hal/assert.h" diff --git a/components/hal/esp32c3/efuse_hal.c b/components/hal/esp32c3/efuse_hal.c index d1a44974ad..2d7801a453 100644 --- a/components/hal/esp32c3/efuse_hal.c +++ b/components/hal/esp32c3/efuse_hal.c @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "sdkconfig.h" #include #include "soc/soc_caps.h" #include "hal/assert.h" diff --git a/components/hal/esp32c61/include/hal/gdma_ll.h b/components/hal/esp32c61/include/hal/gdma_ll.h index 5dfa8e31af..f167217769 100644 --- a/components/hal/esp32c61/include/hal/gdma_ll.h +++ b/components/hal/esp32c61/include/hal/gdma_ll.h @@ -5,7 +5,6 @@ */ #pragma once -#include "sdkconfig.h" #include "soc/pcr_struct.h" #include "hal/ahb_dma_ll.h" #define GDMA_LL_AHB_BURST_SIZE_ADJUSTABLE 1 // AHB GDMA supports adjustable burst size diff --git a/components/hal/esp32p4/include/hal/assist_debug_ll.h b/components/hal/esp32p4/include/hal/assist_debug_ll.h index e22eef7463..479a38f221 100644 --- a/components/hal/esp32p4/include/hal/assist_debug_ll.h +++ b/components/hal/esp32p4/include/hal/assist_debug_ll.h @@ -18,7 +18,7 @@ #include "esp_attr.h" #include "hal/assert.h" #include "soc/hp_sys_clkrst_struct.h" -#include "sdkconfig.h" +#include "soc/soc_caps.h" #ifdef __cplusplus extern "C" { @@ -125,7 +125,7 @@ FORCE_INLINE_ATTR void _assist_debug_ll_enable_bus_clock(bool enable) FORCE_INLINE_ATTR void _assist_debug_ll_reset_register(void) { /* esp32p4 has no assist_debug reset register: disable & clear interrupts manually. */ - for (int i = 0; i < CONFIG_SOC_CPU_CORES_NUM; i++) { + for (int i = 0; i < SOC_CPU_CORES_NUM; i++) { assist_debug_ll_sp_spill_monitor_disable(i); assist_debug_ll_sp_spill_interrupt_clear(i); assist_debug_ll_sp_spill_set_min(i, 0); diff --git a/components/hal/include/hal/pau_types.h b/components/hal/include/hal/pau_types.h index 27903ceed0..d15839eba1 100644 --- a/components/hal/include/hal/pau_types.h +++ b/components/hal/include/hal/pau_types.h @@ -5,7 +5,6 @@ */ #pragma once -#include "sdkconfig.h" #include "soc/soc_caps.h" #include "soc/regdma.h" diff --git a/components/hal/include/hal/rtc_io_hal.h b/components/hal/include/hal/rtc_io_hal.h index 471a09e006..e254ec76d5 100644 --- a/components/hal/include/hal/rtc_io_hal.h +++ b/components/hal/include/hal/rtc_io_hal.h @@ -15,7 +15,6 @@ #pragma once #include -#include "sdkconfig.h" #include "soc/soc_caps.h" #if SOC_RTCIO_PIN_COUNT > 0 diff --git a/components/hal/isp_hal.c b/components/hal/isp_hal.c index d271b0b702..6dc1cad264 100644 --- a/components/hal/isp_hal.c +++ b/components/hal/isp_hal.c @@ -7,7 +7,6 @@ #include #include #include -#include "sdkconfig.h" #include "soc/soc_caps.h" #include "hal/assert.h" #include "hal/log.h" diff --git a/components/hal/lp_timer_hal.c b/components/hal/lp_timer_hal.c index 7fcf95452e..008e2ada9f 100644 --- a/components/hal/lp_timer_hal.c +++ b/components/hal/lp_timer_hal.c @@ -7,7 +7,6 @@ #include #include #include -#include "sdkconfig.h" #include "esp_attr.h" #include "soc/soc.h" #include "hal/lp_timer_ll.h" diff --git a/components/hal/spi_slave_hd_hal.c b/components/hal/spi_slave_hd_hal.c index ab57764f6d..53a432939a 100644 --- a/components/hal/spi_slave_hd_hal.c +++ b/components/hal/spi_slave_hd_hal.c @@ -10,7 +10,6 @@ #include "esp_types.h" #include "esp_attr.h" #include "esp_err.h" -#include "sdkconfig.h" #include "soc/spi_periph.h" #include "soc/lldesc.h" #include "soc/soc_caps.h"