From af02c173fbfb97dc8b9c904b259ed67606cf1b34 Mon Sep 17 00:00:00 2001 From: morris Date: Tue, 18 Nov 2025 18:56:46 +0800 Subject: [PATCH] refactor(soc): remove soc_caps_full.h --- .../subproject/main/ld/esp32s31/bootloader.rom.ld | 6 ------ components/driver/touch_sensor/esp32/touch_sensor.c | 2 +- components/driver/touch_sensor/esp32s2/touch_sensor.c | 2 +- components/driver/touch_sensor/esp32s3/touch_sensor.c | 2 +- components/driver/touch_sensor/touch_sensor_common.c | 2 +- components/esp_driver_gpio/src/dedic_gpio.c | 2 +- .../gpio_extensions/main/test_dedicated_gpio.c | 2 +- .../test_apps/gpio_extensions/main/test_gpio_filter.c | 2 +- components/esp_driver_i2s/i2s_common.c | 1 - components/esp_driver_i2s/i2s_private.h | 1 - .../esp_driver_i2s/test_apps/i2s/main/test_i2s_sleep.c | 2 +- components/esp_hal_ana_conv/adc_hal.c | 2 +- components/esp_hal_dma/include/hal/dma2d_periph.h | 2 +- components/esp_hal_emac/emac_hal.c | 2 +- .../esp_hal_gpio/include/hal/dedic_gpio_periph.h | 2 +- components/esp_hal_gpio/include/hal/sdm_periph.h | 2 +- components/esp_hal_i2s/include/hal/i2s_periph.h | 1 - .../esp_hal_lcd/esp32p4/include/hal/mipi_dsi_brg_ll.h | 3 ++- components/esp_hal_timg/include/hal/timer_periph.h | 2 +- .../esp32/include/hal/touch_sensor_ll.h | 1 - .../esp32p4/include/hal/touch_sensor_ll.h | 1 - .../esp32s2/include/hal/touch_sensor_ll.h | 1 - .../esp32s3/include/hal/touch_sensor_ll.h | 1 - components/esp_hal_usb/usb_dwc_hal.c | 2 +- components/esp_hal_wdt/wdt_hal_iram.c | 2 +- components/esp_hw_support/sleep_system_peripheral.c | 2 +- components/esp_lcd/i80/i80_io_priv.h | 2 +- components/esp_lcd/spi/esp_lcd_panel_io_spi.c | 1 - components/hal/mpi_hal.c | 2 +- components/hal/sha_hal.c | 2 +- components/soc/README.md | 2 +- components/soc/esp32/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32c2/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32c3/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32c5/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32c6/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32c61/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32h2/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32h21/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32h4/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32p4/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32s2/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32s3/include/soc/soc_caps_full.h | 10 ---------- components/soc/esp32s31/gpio_periph.c | 1 + components/soc/esp32s31/include/soc/soc_caps_full.h | 10 ---------- components/soc/include/soc/soc_caps_eval.h | 2 +- components/soc/linux/include/soc/soc_caps_full.h | 10 ---------- 47 files changed, 25 insertions(+), 177 deletions(-) delete mode 100644 components/bootloader/subproject/main/ld/esp32s31/bootloader.rom.ld delete mode 100644 components/soc/esp32/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32c2/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32c3/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32c5/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32c6/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32c61/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32h2/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32h21/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32h4/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32p4/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32s2/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32s3/include/soc/soc_caps_full.h delete mode 100644 components/soc/esp32s31/include/soc/soc_caps_full.h delete mode 100644 components/soc/linux/include/soc/soc_caps_full.h diff --git a/components/bootloader/subproject/main/ld/esp32s31/bootloader.rom.ld b/components/bootloader/subproject/main/ld/esp32s31/bootloader.rom.ld deleted file mode 100644 index 87ad406e3f..0000000000 --- a/components/bootloader/subproject/main/ld/esp32s31/bootloader.rom.ld +++ /dev/null @@ -1,6 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -/* No definition for ESP32-S31 target */ diff --git a/components/driver/touch_sensor/esp32/touch_sensor.c b/components/driver/touch_sensor/esp32/touch_sensor.c index 4d0da393dc..5490822ead 100644 --- a/components/driver/touch_sensor/esp32/touch_sensor.c +++ b/components/driver/touch_sensor/esp32/touch_sensor.c @@ -11,7 +11,7 @@ #include "esp_log.h" #include "sys/lock.h" #include "soc/rtc.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "soc/periph_defs.h" #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" diff --git a/components/driver/touch_sensor/esp32s2/touch_sensor.c b/components/driver/touch_sensor/esp32s2/touch_sensor.c index 4fe1cb3e5c..e69dbd9fc1 100644 --- a/components/driver/touch_sensor/esp32s2/touch_sensor.c +++ b/components/driver/touch_sensor/esp32s2/touch_sensor.c @@ -10,7 +10,7 @@ #include "esp_log.h" #include "sys/lock.h" #include "soc/soc_pins.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "soc/rtc_cntl_reg.h" #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" diff --git a/components/driver/touch_sensor/esp32s3/touch_sensor.c b/components/driver/touch_sensor/esp32s3/touch_sensor.c index ba05743ef2..f3254ace29 100644 --- a/components/driver/touch_sensor/esp32s3/touch_sensor.c +++ b/components/driver/touch_sensor/esp32s3/touch_sensor.c @@ -10,7 +10,7 @@ #include "esp_log.h" #include "sys/lock.h" #include "soc/soc_pins.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "soc/rtc_cntl_reg.h" #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" diff --git a/components/driver/touch_sensor/touch_sensor_common.c b/components/driver/touch_sensor/touch_sensor_common.c index 6b1ac26ba4..c31aa040df 100644 --- a/components/driver/touch_sensor/touch_sensor_common.c +++ b/components/driver/touch_sensor/touch_sensor_common.c @@ -11,7 +11,7 @@ #include "esp_log.h" #include "sys/lock.h" #include "soc/soc_pins.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" #include "freertos/timers.h" diff --git a/components/esp_driver_gpio/src/dedic_gpio.c b/components/esp_driver_gpio/src/dedic_gpio.c index 64cd123428..dcaaf7b9cf 100644 --- a/components/esp_driver_gpio/src/dedic_gpio.c +++ b/components/esp_driver_gpio/src/dedic_gpio.c @@ -15,7 +15,7 @@ #include "esp_log.h" #include "esp_check.h" #include "esp_cpu.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "soc/io_mux_reg.h" #include "hal/dedic_gpio_caps.h" #include "hal/dedic_gpio_cpu_ll.h" diff --git a/components/esp_driver_gpio/test_apps/gpio_extensions/main/test_dedicated_gpio.c b/components/esp_driver_gpio/test_apps/gpio_extensions/main/test_dedicated_gpio.c index a9ab9c8be3..1cc63d7aa3 100644 --- a/components/esp_driver_gpio/test_apps/gpio_extensions/main/test_dedicated_gpio.c +++ b/components/esp_driver_gpio/test_apps/gpio_extensions/main/test_dedicated_gpio.c @@ -11,7 +11,7 @@ #include "unity.h" #include "unity_test_utils.h" #include "esp_rom_sys.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "hal/dedic_gpio_caps.h" #include "hal/dedic_gpio_periph.h" #include "hal/dedic_gpio_cpu_ll.h" diff --git a/components/esp_driver_gpio/test_apps/gpio_extensions/main/test_gpio_filter.c b/components/esp_driver_gpio/test_apps/gpio_extensions/main/test_gpio_filter.c index 58994204a1..e85d42d19a 100644 --- a/components/esp_driver_gpio/test_apps/gpio_extensions/main/test_gpio_filter.c +++ b/components/esp_driver_gpio/test_apps/gpio_extensions/main/test_gpio_filter.c @@ -12,7 +12,7 @@ #include "unity.h" #include "driver/gpio_filter.h" #include "driver/dedic_gpio.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #if CONFIG_IDF_TARGET_ESP32P4 #define TEST_FILTER_GPIO 20 diff --git a/components/esp_driver_i2s/i2s_common.c b/components/esp_driver_i2s/i2s_common.c index ff8d33597d..287668a7f2 100644 --- a/components/esp_driver_i2s/i2s_common.c +++ b/components/esp_driver_i2s/i2s_common.c @@ -23,7 +23,6 @@ #include "hal/i2s_periph.h" #include "soc/soc_caps.h" -#include "soc/soc_caps_full.h" #include "hal/i2s_hal.h" #include "hal/hal_utils.h" #include "hal/dma_types.h" diff --git a/components/esp_driver_i2s/i2s_private.h b/components/esp_driver_i2s/i2s_private.h index 8345f9c61f..6254c6f4f1 100644 --- a/components/esp_driver_i2s/i2s_private.h +++ b/components/esp_driver_i2s/i2s_private.h @@ -13,7 +13,6 @@ #include "freertos/queue.h" #include "soc/lldesc.h" #include "soc/soc_caps.h" -#include "soc/soc_caps_full.h" #include "hal/i2s_periph.h" #include "hal/i2s_hal.h" #include "hal/lp_i2s_hal.h" diff --git a/components/esp_driver_i2s/test_apps/i2s/main/test_i2s_sleep.c b/components/esp_driver_i2s/test_apps/i2s/main/test_i2s_sleep.c index ac5792ce00..b59dae9fba 100644 --- a/components/esp_driver_i2s/test_apps/i2s/main/test_i2s_sleep.c +++ b/components/esp_driver_i2s/test_apps/i2s/main/test_i2s_sleep.c @@ -13,7 +13,7 @@ #include "driver/i2s_std.h" #include "driver/uart.h" #include "soc/i2s_struct.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "esp_sleep.h" #include "esp_private/sleep_cpu.h" #include "esp_private/esp_sleep_internal.h" diff --git a/components/esp_hal_ana_conv/adc_hal.c b/components/esp_hal_ana_conv/adc_hal.c index a371072f36..717eceb088 100644 --- a/components/esp_hal_ana_conv/adc_hal.c +++ b/components/esp_hal_ana_conv/adc_hal.c @@ -8,7 +8,7 @@ #include "hal/adc_hal.h" #include "hal/assert.h" #include "soc/lldesc.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #if SOC_IS(ESP32) //ADC utilises I2S0 DMA on ESP32 diff --git a/components/esp_hal_dma/include/hal/dma2d_periph.h b/components/esp_hal_dma/include/hal/dma2d_periph.h index efee7016b2..128edc0a58 100644 --- a/components/esp_hal_dma/include/hal/dma2d_periph.h +++ b/components/esp_hal_dma/include/hal/dma2d_periph.h @@ -7,7 +7,7 @@ #pragma once #include -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #if SOC_HAS(DMA2D) #include "hal/dma2d_ll.h" diff --git a/components/esp_hal_emac/emac_hal.c b/components/esp_hal_emac/emac_hal.c index 1d6c36f897..954f0f01e3 100644 --- a/components/esp_hal_emac/emac_hal.c +++ b/components/esp_hal_emac/emac_hal.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ #include -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "esp_attr.h" #include "hal/emac_hal.h" #include "hal/emac_ll.h" diff --git a/components/esp_hal_gpio/include/hal/dedic_gpio_periph.h b/components/esp_hal_gpio/include/hal/dedic_gpio_periph.h index 8cc727dd16..477284f53f 100644 --- a/components/esp_hal_gpio/include/hal/dedic_gpio_periph.h +++ b/components/esp_hal_gpio/include/hal/dedic_gpio_periph.h @@ -8,7 +8,7 @@ #include #include "soc/interrupts.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #ifdef __cplusplus extern "C" { diff --git a/components/esp_hal_gpio/include/hal/sdm_periph.h b/components/esp_hal_gpio/include/hal/sdm_periph.h index 27cff9cbc8..6349c0bad9 100644 --- a/components/esp_hal_gpio/include/hal/sdm_periph.h +++ b/components/esp_hal_gpio/include/hal/sdm_periph.h @@ -8,7 +8,7 @@ #include #include -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "soc/periph_defs.h" #include "soc/regdma.h" diff --git a/components/esp_hal_i2s/include/hal/i2s_periph.h b/components/esp_hal_i2s/include/hal/i2s_periph.h index 363d9eac4f..8b9265735d 100644 --- a/components/esp_hal_i2s/include/hal/i2s_periph.h +++ b/components/esp_hal_i2s/include/hal/i2s_periph.h @@ -8,7 +8,6 @@ #include "soc/soc.h" #include "soc/interrupts.h" #include "soc/soc_caps.h" -#include "soc/soc_caps_full.h" #include "soc/regdma.h" #if SOC_HAS(PAU) #include "soc/retention_periph_defs.h" diff --git a/components/esp_hal_lcd/esp32p4/include/hal/mipi_dsi_brg_ll.h b/components/esp_hal_lcd/esp32p4/include/hal/mipi_dsi_brg_ll.h index cb0deb8dc5..1fffcb7e4a 100644 --- a/components/esp_hal_lcd/esp32p4/include/hal/mipi_dsi_brg_ll.h +++ b/components/esp_hal_lcd/esp32p4/include/hal/mipi_dsi_brg_ll.h @@ -130,7 +130,8 @@ static inline void mipi_dsi_brg_ll_set_empty_threshold(dsi_brg_dev_t *dev, uint3 */ static inline void mipi_dsi_brg_ll_set_num_pixel_bits(dsi_brg_dev_t *dev, uint32_t num_pixel_bits) { - dev->raw_num_cfg.raw_num_total = num_pixel_bits / 64; + dev->raw_num_cfg.raw_num_total = (num_pixel_bits + 63) / 64; + dev->raw_num_cfg.unalign_64bit_en = (num_pixel_bits % 64) ? 1 : 0; // reload the value into internal counter dev->raw_num_cfg.raw_num_total_set = 1; } diff --git a/components/esp_hal_timg/include/hal/timer_periph.h b/components/esp_hal_timg/include/hal/timer_periph.h index 471739be84..905dafe435 100644 --- a/components/esp_hal_timg/include/hal/timer_periph.h +++ b/components/esp_hal_timg/include/hal/timer_periph.h @@ -10,7 +10,7 @@ #include #include "soc/timer_group_reg.h" #include "soc/timer_group_struct.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "soc/periph_defs.h" #include "soc/regdma.h" #include "hal/timer_ll.h" diff --git a/components/esp_hal_touch_sens/esp32/include/hal/touch_sensor_ll.h b/components/esp_hal_touch_sens/esp32/include/hal/touch_sensor_ll.h index b37b3b4514..09b5f09915 100644 --- a/components/esp_hal_touch_sens/esp32/include/hal/touch_sensor_ll.h +++ b/components/esp_hal_touch_sens/esp32/include/hal/touch_sensor_ll.h @@ -23,7 +23,6 @@ #include "soc/rtc_io_struct.h" #include "soc/rtc_cntl_struct.h" #include "soc/soc_caps.h" -#include "soc/soc_caps_full.h" #include "hal/touch_sens_types.h" #define TOUCH_LL_GET(_attr) TOUCH_LL_ ## _attr diff --git a/components/esp_hal_touch_sens/esp32p4/include/hal/touch_sensor_ll.h b/components/esp_hal_touch_sens/esp32p4/include/hal/touch_sensor_ll.h index 1c45660dd8..2f462cb6ec 100644 --- a/components/esp_hal_touch_sens/esp32p4/include/hal/touch_sensor_ll.h +++ b/components/esp_hal_touch_sens/esp32p4/include/hal/touch_sensor_ll.h @@ -24,7 +24,6 @@ #include "soc/touch_struct.h" #include "soc/pmu_struct.h" #include "soc/soc_caps.h" -#include "soc/soc_caps_full.h" #include "hal/touch_sens_types.h" #include "hal/config.h" diff --git a/components/esp_hal_touch_sens/esp32s2/include/hal/touch_sensor_ll.h b/components/esp_hal_touch_sens/esp32s2/include/hal/touch_sensor_ll.h index 85e81612e3..ebea542758 100644 --- a/components/esp_hal_touch_sens/esp32s2/include/hal/touch_sensor_ll.h +++ b/components/esp_hal_touch_sens/esp32s2/include/hal/touch_sensor_ll.h @@ -21,7 +21,6 @@ #include "hal/assert.h" #include "hal/touch_sensor_periph.h" #include "soc/soc_caps.h" -#include "soc/soc_caps_full.h" #include "soc/sens_struct.h" #include "soc/rtc_cntl_struct.h" #include "soc/rtc_io_struct.h" diff --git a/components/esp_hal_touch_sens/esp32s3/include/hal/touch_sensor_ll.h b/components/esp_hal_touch_sens/esp32s3/include/hal/touch_sensor_ll.h index 519e1106d9..75f11888aa 100644 --- a/components/esp_hal_touch_sens/esp32s3/include/hal/touch_sensor_ll.h +++ b/components/esp_hal_touch_sens/esp32s3/include/hal/touch_sensor_ll.h @@ -24,7 +24,6 @@ #include "soc/rtc_io_struct.h" #include "soc/sens_struct.h" #include "soc/soc_caps.h" -#include "soc/soc_caps_full.h" #include "hal/touch_sens_types.h" #define TOUCH_LL_GET(_attr) TOUCH_LL_ ## _attr diff --git a/components/esp_hal_usb/usb_dwc_hal.c b/components/esp_hal_usb/usb_dwc_hal.c index db889e6121..f5d49ab76f 100644 --- a/components/esp_hal_usb/usb_dwc_hal.c +++ b/components/esp_hal_usb/usb_dwc_hal.c @@ -8,7 +8,7 @@ #include #include // For memset() #include // For abort() -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "soc/chip_revision.h" #include "soc/usb_periph.h" #include "hal/usb_dwc_hal.h" diff --git a/components/esp_hal_wdt/wdt_hal_iram.c b/components/esp_hal_wdt/wdt_hal_iram.c index e423148283..d256a0abcf 100644 --- a/components/esp_hal_wdt/wdt_hal_iram.c +++ b/components/esp_hal_wdt/wdt_hal_iram.c @@ -8,7 +8,7 @@ #include #include "hal/wdt_types.h" #include "hal/wdt_hal.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" /* ---------------------------- Init and Config ----------------------------- */ diff --git a/components/esp_hw_support/sleep_system_peripheral.c b/components/esp_hw_support/sleep_system_peripheral.c index c872146a58..3dbda8d8c2 100644 --- a/components/esp_hw_support/sleep_system_peripheral.c +++ b/components/esp_hw_support/sleep_system_peripheral.c @@ -8,7 +8,7 @@ #include #include "sdkconfig.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "soc/system_periph_retention.h" #include "soc/uart_periph.h" #include "hal/timer_ll.h" diff --git a/components/esp_lcd/i80/i80_io_priv.h b/components/esp_lcd/i80/i80_io_priv.h index bb52e2aa5b..cffcad1bda 100644 --- a/components/esp_lcd/i80/i80_io_priv.h +++ b/components/esp_lcd/i80/i80_io_priv.h @@ -16,7 +16,7 @@ // Set the maximum log level for gptimer driver #define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE #endif -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/queue.h" diff --git a/components/esp_lcd/spi/esp_lcd_panel_io_spi.c b/components/esp_lcd/spi/esp_lcd_panel_io_spi.c index 8bd3b7bd56..eae42c890d 100644 --- a/components/esp_lcd/spi/esp_lcd_panel_io_spi.c +++ b/components/esp_lcd/spi/esp_lcd_panel_io_spi.c @@ -98,7 +98,6 @@ esp_err_t esp_lcd_new_panel_io_spi(esp_lcd_spi_bus_handle_t bus, const esp_lcd_p // if the DC line is not encoded into any spi transaction phase or it's not controlled by SPI peripheral if (io_config->dc_gpio_num >= 0) { gpio_set_level(io_config->dc_gpio_num, 0); - gpio_func_sel(io_config->dc_gpio_num, PIN_FUNC_GPIO); gpio_output_enable(io_config->dc_gpio_num); } diff --git a/components/hal/mpi_hal.c b/components/hal/mpi_hal.c index 42ac404522..47ccba4c56 100644 --- a/components/hal/mpi_hal.c +++ b/components/hal/mpi_hal.c @@ -5,7 +5,7 @@ */ #include "hal/mpi_hal.h" #include "hal/mpi_ll.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" size_t mpi_hal_calc_hardware_words(size_t words) { diff --git a/components/hal/sha_hal.c b/components/hal/sha_hal.c index c0225be393..6ab4068464 100644 --- a/components/hal/sha_hal.c +++ b/components/hal/sha_hal.c @@ -11,7 +11,7 @@ #include "hal/sha_hal.h" #include "hal/sha_types.h" #include "hal/sha_ll.h" -#include "soc/soc_caps_full.h" +#include "soc/soc_caps.h" #define SHA1_STATE_LEN_WORDS (160 / 32) diff --git a/components/soc/README.md b/components/soc/README.md index 111ffefc5c..54443460d6 100644 --- a/components/soc/README.md +++ b/components/soc/README.md @@ -12,7 +12,7 @@ The `soc` component provides register-level descriptions for targets supported b ## The SoC Capabilities -There are two documents describing SoC capabilities, `soc_caps.h` and `soc_caps_full.h`. The former is a public header file, and the information in it is coarse-grained. The latter is a header file for internal developers that contains fine-grained module information. To used the soc capability macros, you should use the macro functions offered by `soc/soc_caps_eval.h`. +`soc_caps.h` file describes the SoC capabilities. To used the soc capability macros, you should use the macro functions offered by `soc/soc_caps_eval.h`. | Macro function | Description | Example | |----------------|-------------|---------| diff --git a/components/soc/esp32/include/soc/soc_caps_full.h b/components/soc/esp32/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32c2/include/soc/soc_caps_full.h b/components/soc/esp32c2/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32c2/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32c3/include/soc/soc_caps_full.h b/components/soc/esp32c3/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32c3/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32c5/include/soc/soc_caps_full.h b/components/soc/esp32c5/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32c5/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32c6/include/soc/soc_caps_full.h b/components/soc/esp32c6/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32c6/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32c61/include/soc/soc_caps_full.h b/components/soc/esp32c61/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32c61/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32h2/include/soc/soc_caps_full.h b/components/soc/esp32h2/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32h2/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32h21/include/soc/soc_caps_full.h b/components/soc/esp32h21/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32h21/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32h4/include/soc/soc_caps_full.h b/components/soc/esp32h4/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32h4/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32p4/include/soc/soc_caps_full.h b/components/soc/esp32p4/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32p4/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32s2/include/soc/soc_caps_full.h b/components/soc/esp32s2/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32s2/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32s3/include/soc/soc_caps_full.h b/components/soc/esp32s3/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32s3/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/esp32s31/gpio_periph.c b/components/soc/esp32s31/gpio_periph.c index 394b2a7ea2..ee98eb2273 100644 --- a/components/soc/esp32s31/gpio_periph.c +++ b/components/soc/esp32s31/gpio_periph.c @@ -5,6 +5,7 @@ */ #include "soc/gpio_periph.h" +#include "soc/io_mux_reg.h" #include "esp_assert.h" #include "soc/io_mux_reg.h" diff --git a/components/soc/esp32s31/include/soc/soc_caps_full.h b/components/soc/esp32s31/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/esp32s31/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h" diff --git a/components/soc/include/soc/soc_caps_eval.h b/components/soc/include/soc/soc_caps_eval.h index 335f2724a6..faeec10965 100644 --- a/components/soc/include/soc/soc_caps_eval.h +++ b/components/soc/include/soc/soc_caps_eval.h @@ -10,7 +10,7 @@ * SOC Capability evaluation helpers * * These macros provide a standardized way to query SOC capabilities without directly - * accessing internal implementation macros in soc_caps_full.h and public macros in soc_caps.h. + * accessing the macros in soc_caps.h. * * The main categories of macros are: * - SOC_IS : Check if the SOC is a specific target (e.g., SOC_IS(ESP32S3)) diff --git a/components/soc/linux/include/soc/soc_caps_full.h b/components/soc/linux/include/soc/soc_caps_full.h deleted file mode 100644 index f031101adc..0000000000 --- a/components/soc/linux/include/soc/soc_caps_full.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - */ - -#pragma once - -#include "soc/soc_caps.h" -#include "soc/soc_caps_eval.h"