diff --git a/components/bootloader/subproject/CMakeLists.txt b/components/bootloader/subproject/CMakeLists.txt index 5d967bd9a7..a65fd3b0d4 100644 --- a/components/bootloader/subproject/CMakeLists.txt +++ b/components/bootloader/subproject/CMakeLists.txt @@ -20,7 +20,7 @@ set(BOOTLOADER_BUILD 1) include("${IDF_PATH}/tools/cmake/project.cmake") set(common_req log esp_rom esp_common xtensa) if(LEGACY_INCLUDE_COMMON_HEADERS) - list(APPEND common_req soc) + list(APPEND common_req soc hal) endif() idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${common_req}") idf_build_set_property(__OUTPUT_SDKCONFIG 0) diff --git a/components/bootloader/subproject/Makefile b/components/bootloader/subproject/Makefile index e29bdf711f..0a72a6fd06 100644 --- a/components/bootloader/subproject/Makefile +++ b/components/bootloader/subproject/Makefile @@ -8,7 +8,7 @@ endif PROJECT_NAME := bootloader -COMPONENTS := esptool_py bootloader_support log spi_flash micro-ecc soc main efuse esp_rom +COMPONENTS := esptool_py bootloader_support log spi_flash micro-ecc soc main efuse esp_rom hal # Clear C and CXX from top level project CFLAGS = diff --git a/components/bootloader_support/CMakeLists.txt b/components/bootloader_support/CMakeLists.txt index c5674c5e1a..1f16c3152e 100644 --- a/components/bootloader_support/CMakeLists.txt +++ b/components/bootloader_support/CMakeLists.txt @@ -24,6 +24,7 @@ if(BOOTLOADER_BUILD) "src/${IDF_TARGET}/flash_encrypt.c" "src/${IDF_TARGET}/bootloader_${IDF_TARGET}.c" ) + list(APPEND priv_requires hal) else() list(APPEND srcs "src/idf/bootloader_sha.c") diff --git a/components/driver/CMakeLists.txt b/components/driver/CMakeLists.txt index c4113b42c4..9f326154a1 100644 --- a/components/driver/CMakeLists.txt +++ b/components/driver/CMakeLists.txt @@ -44,7 +44,6 @@ if(IDF_TARGET STREQUAL "esp32s2") "esp32s2/adc2_init_cal.c" "spi_slave_hd.c" "esp32s2/dac.c") - # currently only S2 beta has its own target-specific includes list(APPEND includes "esp32s2/include") endif() @@ -52,7 +51,7 @@ idf_component_register(SRCS "${srcs}" INCLUDE_DIRS ${includes} PRIV_INCLUDE_DIRS "include/driver" PRIV_REQUIRES efuse esp_timer esp_ipc - REQUIRES esp_ringbuf freertos soc) #cannot totally hide soc headers, since there are a lot arguments in the driver are chip-dependent + REQUIRES esp_ringbuf freertos soc hal) # cannot totally hide soc headers, since there are a lot arguments in the driver are chip-dependent # uses C11 atomic feature set_source_files_properties(spi_master.c PROPERTIES COMPILE_FLAGS -std=gnu11) diff --git a/components/esp_common/src/esp_err_to_name.c b/components/esp_common/src/esp_err_to_name.c index 5d073e9508..a45bbe323a 100644 --- a/components/esp_common/src/esp_err_to_name.c +++ b/components/esp_common/src/esp_err_to_name.c @@ -527,7 +527,7 @@ static const esp_err_msg_t esp_err_msg_table[] = { # ifdef ESP_ERR_FLASH_OP_TIMEOUT ERR_TBL_IT(ESP_ERR_FLASH_OP_TIMEOUT), /* 24578 0x6002 */ # endif - // components/soc/include/hal/esp_flash_err.h + // components/hal/include/hal/esp_flash_err.h # ifdef ESP_ERR_FLASH_NOT_INITIALISED ERR_TBL_IT(ESP_ERR_FLASH_NOT_INITIALISED), /* 24579 0x6003 */ # endif diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt index 930dcd53d2..9c4c1432b8 100644 --- a/components/esp_rom/CMakeLists.txt +++ b/components/esp_rom/CMakeLists.txt @@ -5,7 +5,7 @@ idf_component_register(SRCS "patches/esp_rom_crc.c" "patches/esp_rom_uart.c" INCLUDE_DIRS include PRIV_INCLUDE_DIRS "${target}" - PRIV_REQUIRES soc) + PRIV_REQUIRES soc hal) if(BOOTLOADER_BUILD) set(scripts diff --git a/components/fatfs/test_fatfs_host/Makefile.files b/components/fatfs/test_fatfs_host/Makefile.files index 2055ab8901..ae9b5edcb7 100644 --- a/components/fatfs/test_fatfs_host/Makefile.files +++ b/components/fatfs/test_fatfs_host/Makefile.files @@ -34,6 +34,7 @@ INCLUDE_DIRS := \ esp_common/include \ bootloader_support/include \ app_update/include \ + hal/include \ spi_flash/include \ wear_levelling/include \ ) diff --git a/components/hal/CMakeLists.txt b/components/hal/CMakeLists.txt new file mode 100644 index 0000000000..f62b8c6397 --- /dev/null +++ b/components/hal/CMakeLists.txt @@ -0,0 +1,73 @@ +idf_build_get_property(target IDF_TARGET) + +set(srcs "wdt_hal_iram.c" + "mpu_hal.c") +set(includes "${target}/include" "include") + +if(NOT BOOTLOADER_BUILD) + list(APPEND srcs + "cpu_hal.c" + "rmt_hal.c" + "rtc_io_hal.c" + "dac_hal.c" + "adc_hal.c" + "spi_hal.c" + "spi_hal_iram.c" + "spi_slave_hal.c" + "spi_slave_hal_iram.c" + "touch_sensor_hal.c" + "pcnt_hal.c" + "i2s_hal.c" + "sigmadelta_hal.c" + "timer_hal.c" + "ledc_hal.c" + "ledc_hal_iram.c" + "i2c_hal.c" + "i2c_hal_iram.c" + "gpio_hal.c" + "uart_hal.c" + "uart_hal_iram.c" + "spi_flash_hal.c" + "spi_flash_hal_iram.c" + "soc_hal.c" + "twai_hal.c") + + if(${target} STREQUAL "esp32") + list(APPEND srcs + "mcpwm_hal.c" + "sdio_slave_hal.c" + "esp32/adc_hal.c" + "esp32/brownout_hal.c" + "esp32/touch_sensor_hal.c") + if(NOT BOOTLOADER_BUILD AND CONFIG_ETH_USE_ESP32_EMAC) + list(APPEND srcs "esp32/emac_hal.c") + endif() + endif() + + if(${target} STREQUAL "esp32s2") + list(APPEND srcs + "spi_flash_hal_gpspi.c" + "spi_slave_hd_hal.c" + "esp32s2/adc_hal.c" + "esp32s2/brownout_hal.c" + "esp32s2/cp_dma_hal.c" + "esp32s2/systimer_hal.c" + "esp32s2/touch_sensor_hal.c" + "esp32s2/usb_hal.c") + endif() + + if(${target} STREQUAL "esp32s3") + list(APPEND srcs + "esp32s3/brownout_hal.c" + "esp32s3/systimer_hal.c" + "esp32s3/touch_sensor_hal.c") + endif() +endif() + +idf_component_register(SRCS ${srcs} + INCLUDE_DIRS ${includes} + PRIV_INCLUDE_DIRS ${priv_include} + REQUIRES soc + LDFRAGMENTS linker.lf) + + diff --git a/components/soc/src/hal/adc_hal.c b/components/hal/adc_hal.c similarity index 100% rename from components/soc/src/hal/adc_hal.c rename to components/hal/adc_hal.c diff --git a/components/hal/component.mk b/components/hal/component.mk new file mode 100644 index 0000000000..5ad2ee6c86 --- /dev/null +++ b/components/hal/component.mk @@ -0,0 +1,10 @@ +COMPONENT_SRCDIRS := . esp32 +COMPONENT_ADD_INCLUDEDIRS := esp32/include include +COMPONENT_ADD_LDFRAGMENTS += linker.lf + +COMPONENT_OBJEXCLUDE += ./spi_slave_hd_hal.o ./spi_flash_hal_gpspi.o ./spi_slave_hd_hal.o + +ifndef CONFIG_ETH_USE_ESP32_EMAC + COMPONENT_OBJEXCLUDE += esp32/emac_hal.o +endif + diff --git a/components/soc/src/hal/cpu_hal.c b/components/hal/cpu_hal.c similarity index 100% rename from components/soc/src/hal/cpu_hal.c rename to components/hal/cpu_hal.c diff --git a/components/soc/src/hal/dac_hal.c b/components/hal/dac_hal.c similarity index 100% rename from components/soc/src/hal/dac_hal.c rename to components/hal/dac_hal.c diff --git a/components/soc/src/esp32/adc_hal.c b/components/hal/esp32/adc_hal.c similarity index 100% rename from components/soc/src/esp32/adc_hal.c rename to components/hal/esp32/adc_hal.c diff --git a/components/soc/src/esp32/brownout_hal.c b/components/hal/esp32/brownout_hal.c similarity index 100% rename from components/soc/src/esp32/brownout_hal.c rename to components/hal/esp32/brownout_hal.c diff --git a/components/soc/src/esp32/emac_hal.c b/components/hal/esp32/emac_hal.c similarity index 100% rename from components/soc/src/esp32/emac_hal.c rename to components/hal/esp32/emac_hal.c diff --git a/components/soc/src/esp32/include/hal/adc_hal.h b/components/hal/esp32/include/hal/adc_hal.h similarity index 100% rename from components/soc/src/esp32/include/hal/adc_hal.h rename to components/hal/esp32/include/hal/adc_hal.h diff --git a/components/soc/src/esp32/include/hal/adc_ll.h b/components/hal/esp32/include/hal/adc_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/adc_ll.h rename to components/hal/esp32/include/hal/adc_ll.h diff --git a/components/soc/src/esp32/include/hal/can_hal.h b/components/hal/esp32/include/hal/can_hal.h similarity index 100% rename from components/soc/src/esp32/include/hal/can_hal.h rename to components/hal/esp32/include/hal/can_hal.h diff --git a/components/soc/src/esp32/include/hal/can_ll.h b/components/hal/esp32/include/hal/can_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/can_ll.h rename to components/hal/esp32/include/hal/can_ll.h diff --git a/components/soc/src/esp32/include/hal/can_types.h b/components/hal/esp32/include/hal/can_types.h similarity index 100% rename from components/soc/src/esp32/include/hal/can_types.h rename to components/hal/esp32/include/hal/can_types.h diff --git a/components/soc/src/esp32/include/hal/clk_gate_ll.h b/components/hal/esp32/include/hal/clk_gate_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/clk_gate_ll.h rename to components/hal/esp32/include/hal/clk_gate_ll.h diff --git a/components/soc/src/esp32/include/hal/cpu_ll.h b/components/hal/esp32/include/hal/cpu_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/cpu_ll.h rename to components/hal/esp32/include/hal/cpu_ll.h diff --git a/components/soc/src/esp32/include/hal/dac_ll.h b/components/hal/esp32/include/hal/dac_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/dac_ll.h rename to components/hal/esp32/include/hal/dac_ll.h diff --git a/components/soc/src/esp32/include/hal/emac.h b/components/hal/esp32/include/hal/emac.h similarity index 100% rename from components/soc/src/esp32/include/hal/emac.h rename to components/hal/esp32/include/hal/emac.h diff --git a/components/soc/src/esp32/include/hal/gpio_ll.h b/components/hal/esp32/include/hal/gpio_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/gpio_ll.h rename to components/hal/esp32/include/hal/gpio_ll.h diff --git a/components/soc/src/esp32/include/hal/i2c_ll.h b/components/hal/esp32/include/hal/i2c_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/i2c_ll.h rename to components/hal/esp32/include/hal/i2c_ll.h diff --git a/components/soc/src/esp32/include/hal/i2s_ll.h b/components/hal/esp32/include/hal/i2s_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/i2s_ll.h rename to components/hal/esp32/include/hal/i2s_ll.h diff --git a/components/soc/src/esp32/include/hal/ledc_ll.h b/components/hal/esp32/include/hal/ledc_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/ledc_ll.h rename to components/hal/esp32/include/hal/ledc_ll.h diff --git a/components/soc/src/esp32/include/hal/mcpwm_ll.h b/components/hal/esp32/include/hal/mcpwm_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/mcpwm_ll.h rename to components/hal/esp32/include/hal/mcpwm_ll.h diff --git a/components/soc/src/esp32/include/hal/mpu_ll.h b/components/hal/esp32/include/hal/mpu_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/mpu_ll.h rename to components/hal/esp32/include/hal/mpu_ll.h diff --git a/components/soc/src/esp32/include/hal/mwdt_ll.h b/components/hal/esp32/include/hal/mwdt_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/mwdt_ll.h rename to components/hal/esp32/include/hal/mwdt_ll.h diff --git a/components/soc/src/esp32/include/hal/pcnt_ll.h b/components/hal/esp32/include/hal/pcnt_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/pcnt_ll.h rename to components/hal/esp32/include/hal/pcnt_ll.h diff --git a/components/soc/src/esp32/include/hal/rmt_ll.h b/components/hal/esp32/include/hal/rmt_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/rmt_ll.h rename to components/hal/esp32/include/hal/rmt_ll.h diff --git a/components/soc/src/esp32/include/hal/rtc_cntl_ll.h b/components/hal/esp32/include/hal/rtc_cntl_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/rtc_cntl_ll.h rename to components/hal/esp32/include/hal/rtc_cntl_ll.h diff --git a/components/soc/src/esp32/include/hal/rtc_io_ll.h b/components/hal/esp32/include/hal/rtc_io_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/rtc_io_ll.h rename to components/hal/esp32/include/hal/rtc_io_ll.h diff --git a/components/soc/src/esp32/include/hal/rwdt_ll.h b/components/hal/esp32/include/hal/rwdt_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/rwdt_ll.h rename to components/hal/esp32/include/hal/rwdt_ll.h diff --git a/components/soc/src/esp32/include/hal/sigmadelta_ll.h b/components/hal/esp32/include/hal/sigmadelta_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/sigmadelta_ll.h rename to components/hal/esp32/include/hal/sigmadelta_ll.h diff --git a/components/soc/src/esp32/include/hal/soc_ll.h b/components/hal/esp32/include/hal/soc_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/soc_ll.h rename to components/hal/esp32/include/hal/soc_ll.h diff --git a/components/soc/src/esp32/include/hal/spi_flash_ll.h b/components/hal/esp32/include/hal/spi_flash_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/spi_flash_ll.h rename to components/hal/esp32/include/hal/spi_flash_ll.h diff --git a/components/soc/src/esp32/include/hal/spi_ll.h b/components/hal/esp32/include/hal/spi_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/spi_ll.h rename to components/hal/esp32/include/hal/spi_ll.h diff --git a/components/soc/src/esp32/include/hal/timer_ll.h b/components/hal/esp32/include/hal/timer_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/timer_ll.h rename to components/hal/esp32/include/hal/timer_ll.h diff --git a/components/soc/src/esp32/include/hal/touch_sensor_hal.h b/components/hal/esp32/include/hal/touch_sensor_hal.h similarity index 100% rename from components/soc/src/esp32/include/hal/touch_sensor_hal.h rename to components/hal/esp32/include/hal/touch_sensor_hal.h diff --git a/components/soc/src/esp32/include/hal/touch_sensor_ll.h b/components/hal/esp32/include/hal/touch_sensor_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/touch_sensor_ll.h rename to components/hal/esp32/include/hal/touch_sensor_ll.h diff --git a/components/soc/src/esp32/include/hal/twai_ll.h b/components/hal/esp32/include/hal/twai_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/twai_ll.h rename to components/hal/esp32/include/hal/twai_ll.h diff --git a/components/soc/src/esp32/include/hal/uart_ll.h b/components/hal/esp32/include/hal/uart_ll.h similarity index 100% rename from components/soc/src/esp32/include/hal/uart_ll.h rename to components/hal/esp32/include/hal/uart_ll.h diff --git a/components/soc/src/esp32/touch_sensor_hal.c b/components/hal/esp32/touch_sensor_hal.c similarity index 100% rename from components/soc/src/esp32/touch_sensor_hal.c rename to components/hal/esp32/touch_sensor_hal.c diff --git a/components/soc/src/esp32s2/adc_hal.c b/components/hal/esp32s2/adc_hal.c similarity index 100% rename from components/soc/src/esp32s2/adc_hal.c rename to components/hal/esp32s2/adc_hal.c diff --git a/components/soc/src/esp32s2/brownout_hal.c b/components/hal/esp32s2/brownout_hal.c similarity index 100% rename from components/soc/src/esp32s2/brownout_hal.c rename to components/hal/esp32s2/brownout_hal.c diff --git a/components/soc/src/esp32s2/cp_dma_hal.c b/components/hal/esp32s2/cp_dma_hal.c similarity index 100% rename from components/soc/src/esp32s2/cp_dma_hal.c rename to components/hal/esp32s2/cp_dma_hal.c diff --git a/components/soc/src/esp32s2/include/hal/adc_hal.h b/components/hal/esp32s2/include/hal/adc_hal.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/adc_hal.h rename to components/hal/esp32s2/include/hal/adc_hal.h diff --git a/components/soc/src/esp32s2/include/hal/adc_ll.h b/components/hal/esp32s2/include/hal/adc_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/adc_ll.h rename to components/hal/esp32s2/include/hal/adc_ll.h diff --git a/components/soc/src/esp32s2/include/hal/clk_gate_ll.h b/components/hal/esp32s2/include/hal/clk_gate_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/clk_gate_ll.h rename to components/hal/esp32s2/include/hal/clk_gate_ll.h diff --git a/components/soc/src/esp32s2/include/hal/cp_dma_hal.h b/components/hal/esp32s2/include/hal/cp_dma_hal.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/cp_dma_hal.h rename to components/hal/esp32s2/include/hal/cp_dma_hal.h diff --git a/components/soc/src/esp32s2/include/hal/cp_dma_ll.h b/components/hal/esp32s2/include/hal/cp_dma_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/cp_dma_ll.h rename to components/hal/esp32s2/include/hal/cp_dma_ll.h diff --git a/components/soc/src/esp32s2/include/hal/cpu_ll.h b/components/hal/esp32s2/include/hal/cpu_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/cpu_ll.h rename to components/hal/esp32s2/include/hal/cpu_ll.h diff --git a/components/soc/src/esp32s2/include/hal/dac_ll.h b/components/hal/esp32s2/include/hal/dac_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/dac_ll.h rename to components/hal/esp32s2/include/hal/dac_ll.h diff --git a/components/soc/src/esp32s2/include/hal/gpio_ll.h b/components/hal/esp32s2/include/hal/gpio_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/gpio_ll.h rename to components/hal/esp32s2/include/hal/gpio_ll.h diff --git a/components/soc/src/esp32s2/include/hal/gpspi_flash_ll.h b/components/hal/esp32s2/include/hal/gpspi_flash_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/gpspi_flash_ll.h rename to components/hal/esp32s2/include/hal/gpspi_flash_ll.h diff --git a/components/soc/src/esp32s2/include/hal/i2c_ll.h b/components/hal/esp32s2/include/hal/i2c_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/i2c_ll.h rename to components/hal/esp32s2/include/hal/i2c_ll.h diff --git a/components/soc/src/esp32s2/include/hal/i2s_ll.h b/components/hal/esp32s2/include/hal/i2s_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/i2s_ll.h rename to components/hal/esp32s2/include/hal/i2s_ll.h diff --git a/components/soc/src/esp32s2/include/hal/ledc_ll.h b/components/hal/esp32s2/include/hal/ledc_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/ledc_ll.h rename to components/hal/esp32s2/include/hal/ledc_ll.h diff --git a/components/soc/src/esp32s2/include/hal/memprot_ll.h b/components/hal/esp32s2/include/hal/memprot_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/memprot_ll.h rename to components/hal/esp32s2/include/hal/memprot_ll.h diff --git a/components/soc/src/esp32s2/include/hal/mpu_ll.h b/components/hal/esp32s2/include/hal/mpu_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/mpu_ll.h rename to components/hal/esp32s2/include/hal/mpu_ll.h diff --git a/components/soc/src/esp32s2/include/hal/mwdt_ll.h b/components/hal/esp32s2/include/hal/mwdt_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/mwdt_ll.h rename to components/hal/esp32s2/include/hal/mwdt_ll.h diff --git a/components/soc/src/esp32s2/include/hal/pcnt_ll.h b/components/hal/esp32s2/include/hal/pcnt_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/pcnt_ll.h rename to components/hal/esp32s2/include/hal/pcnt_ll.h diff --git a/components/soc/src/esp32s2/include/hal/rmt_ll.h b/components/hal/esp32s2/include/hal/rmt_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/rmt_ll.h rename to components/hal/esp32s2/include/hal/rmt_ll.h diff --git a/components/soc/src/esp32s2/include/hal/rtc_cntl_ll.h b/components/hal/esp32s2/include/hal/rtc_cntl_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/rtc_cntl_ll.h rename to components/hal/esp32s2/include/hal/rtc_cntl_ll.h diff --git a/components/soc/src/esp32s2/include/hal/rtc_io_ll.h b/components/hal/esp32s2/include/hal/rtc_io_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/rtc_io_ll.h rename to components/hal/esp32s2/include/hal/rtc_io_ll.h diff --git a/components/soc/src/esp32s2/include/hal/rwdt_ll.h b/components/hal/esp32s2/include/hal/rwdt_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/rwdt_ll.h rename to components/hal/esp32s2/include/hal/rwdt_ll.h diff --git a/components/soc/src/esp32s2/include/hal/sigmadelta_ll.h b/components/hal/esp32s2/include/hal/sigmadelta_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/sigmadelta_ll.h rename to components/hal/esp32s2/include/hal/sigmadelta_ll.h diff --git a/components/soc/src/esp32s2/include/hal/soc_ll.h b/components/hal/esp32s2/include/hal/soc_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/soc_ll.h rename to components/hal/esp32s2/include/hal/soc_ll.h diff --git a/components/soc/src/esp32s2/include/hal/spi_flash_ll.h b/components/hal/esp32s2/include/hal/spi_flash_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/spi_flash_ll.h rename to components/hal/esp32s2/include/hal/spi_flash_ll.h diff --git a/components/soc/src/esp32s2/include/hal/spi_ll.h b/components/hal/esp32s2/include/hal/spi_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/spi_ll.h rename to components/hal/esp32s2/include/hal/spi_ll.h diff --git a/components/soc/src/esp32s2/include/hal/spimem_flash_ll.h b/components/hal/esp32s2/include/hal/spimem_flash_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/spimem_flash_ll.h rename to components/hal/esp32s2/include/hal/spimem_flash_ll.h diff --git a/components/soc/src/esp32s2/include/hal/systimer_ll.h b/components/hal/esp32s2/include/hal/systimer_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/systimer_ll.h rename to components/hal/esp32s2/include/hal/systimer_ll.h diff --git a/components/soc/src/esp32s2/include/hal/timer_ll.h b/components/hal/esp32s2/include/hal/timer_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/timer_ll.h rename to components/hal/esp32s2/include/hal/timer_ll.h diff --git a/components/soc/src/esp32s2/include/hal/touch_sensor_hal.h b/components/hal/esp32s2/include/hal/touch_sensor_hal.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/touch_sensor_hal.h rename to components/hal/esp32s2/include/hal/touch_sensor_hal.h diff --git a/components/soc/src/esp32s2/include/hal/touch_sensor_ll.h b/components/hal/esp32s2/include/hal/touch_sensor_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/touch_sensor_ll.h rename to components/hal/esp32s2/include/hal/touch_sensor_ll.h diff --git a/components/soc/src/esp32s2/include/hal/twai_ll.h b/components/hal/esp32s2/include/hal/twai_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/twai_ll.h rename to components/hal/esp32s2/include/hal/twai_ll.h diff --git a/components/soc/src/esp32s2/include/hal/uart_ll.h b/components/hal/esp32s2/include/hal/uart_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/uart_ll.h rename to components/hal/esp32s2/include/hal/uart_ll.h diff --git a/components/soc/src/esp32s2/include/hal/usb_ll.h b/components/hal/esp32s2/include/hal/usb_ll.h similarity index 100% rename from components/soc/src/esp32s2/include/hal/usb_ll.h rename to components/hal/esp32s2/include/hal/usb_ll.h diff --git a/components/soc/src/esp32s2/systimer_hal.c b/components/hal/esp32s2/systimer_hal.c similarity index 100% rename from components/soc/src/esp32s2/systimer_hal.c rename to components/hal/esp32s2/systimer_hal.c diff --git a/components/soc/src/esp32s2/touch_sensor_hal.c b/components/hal/esp32s2/touch_sensor_hal.c similarity index 100% rename from components/soc/src/esp32s2/touch_sensor_hal.c rename to components/hal/esp32s2/touch_sensor_hal.c diff --git a/components/soc/src/esp32s2/usb_hal.c b/components/hal/esp32s2/usb_hal.c similarity index 100% rename from components/soc/src/esp32s2/usb_hal.c rename to components/hal/esp32s2/usb_hal.c diff --git a/components/soc/src/esp32s3/brownout_hal.c b/components/hal/esp32s3/brownout_hal.c similarity index 100% rename from components/soc/src/esp32s3/brownout_hal.c rename to components/hal/esp32s3/brownout_hal.c diff --git a/components/soc/src/esp32s3/include/hal/adc_hal.h b/components/hal/esp32s3/include/hal/adc_hal.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/adc_hal.h rename to components/hal/esp32s3/include/hal/adc_hal.h diff --git a/components/soc/src/esp32s3/include/hal/adc_ll.h b/components/hal/esp32s3/include/hal/adc_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/adc_ll.h rename to components/hal/esp32s3/include/hal/adc_ll.h diff --git a/components/soc/src/esp32s3/include/hal/clk_gate_ll.h b/components/hal/esp32s3/include/hal/clk_gate_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/clk_gate_ll.h rename to components/hal/esp32s3/include/hal/clk_gate_ll.h diff --git a/components/soc/src/esp32s3/include/hal/cpu_ll.h b/components/hal/esp32s3/include/hal/cpu_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/cpu_ll.h rename to components/hal/esp32s3/include/hal/cpu_ll.h diff --git a/components/soc/src/esp32s3/include/hal/dac_ll.h b/components/hal/esp32s3/include/hal/dac_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/dac_ll.h rename to components/hal/esp32s3/include/hal/dac_ll.h diff --git a/components/soc/src/esp32s3/include/hal/gpio_ll.h b/components/hal/esp32s3/include/hal/gpio_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/gpio_ll.h rename to components/hal/esp32s3/include/hal/gpio_ll.h diff --git a/components/soc/src/esp32s3/include/hal/gpspi_flash_ll.h b/components/hal/esp32s3/include/hal/gpspi_flash_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/gpspi_flash_ll.h rename to components/hal/esp32s3/include/hal/gpspi_flash_ll.h diff --git a/components/soc/src/esp32s3/include/hal/i2c_ll.h b/components/hal/esp32s3/include/hal/i2c_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/i2c_ll.h rename to components/hal/esp32s3/include/hal/i2c_ll.h diff --git a/components/soc/src/esp32s3/include/hal/i2s_ll.h b/components/hal/esp32s3/include/hal/i2s_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/i2s_ll.h rename to components/hal/esp32s3/include/hal/i2s_ll.h diff --git a/components/soc/src/esp32s3/include/hal/ledc_ll.h b/components/hal/esp32s3/include/hal/ledc_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/ledc_ll.h rename to components/hal/esp32s3/include/hal/ledc_ll.h diff --git a/components/soc/src/esp32s3/include/hal/mcpwm_ll.h b/components/hal/esp32s3/include/hal/mcpwm_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/mcpwm_ll.h rename to components/hal/esp32s3/include/hal/mcpwm_ll.h diff --git a/components/soc/src/esp32s3/include/hal/memprot_ll.h b/components/hal/esp32s3/include/hal/memprot_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/memprot_ll.h rename to components/hal/esp32s3/include/hal/memprot_ll.h diff --git a/components/soc/src/esp32s3/include/hal/mpu_ll.h b/components/hal/esp32s3/include/hal/mpu_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/mpu_ll.h rename to components/hal/esp32s3/include/hal/mpu_ll.h diff --git a/components/soc/src/esp32s3/include/hal/mwdt_ll.h b/components/hal/esp32s3/include/hal/mwdt_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/mwdt_ll.h rename to components/hal/esp32s3/include/hal/mwdt_ll.h diff --git a/components/soc/src/esp32s3/include/hal/pcnt_ll.h b/components/hal/esp32s3/include/hal/pcnt_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/pcnt_ll.h rename to components/hal/esp32s3/include/hal/pcnt_ll.h diff --git a/components/soc/src/esp32s3/include/hal/rmt_ll.h b/components/hal/esp32s3/include/hal/rmt_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/rmt_ll.h rename to components/hal/esp32s3/include/hal/rmt_ll.h diff --git a/components/soc/src/esp32s3/include/hal/rtc_cntl_ll.h b/components/hal/esp32s3/include/hal/rtc_cntl_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/rtc_cntl_ll.h rename to components/hal/esp32s3/include/hal/rtc_cntl_ll.h diff --git a/components/soc/src/esp32s3/include/hal/rtc_io_ll.h b/components/hal/esp32s3/include/hal/rtc_io_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/rtc_io_ll.h rename to components/hal/esp32s3/include/hal/rtc_io_ll.h diff --git a/components/soc/src/esp32s3/include/hal/rwdt_ll.h b/components/hal/esp32s3/include/hal/rwdt_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/rwdt_ll.h rename to components/hal/esp32s3/include/hal/rwdt_ll.h diff --git a/components/soc/src/esp32s3/include/hal/sigmadelta_ll.h b/components/hal/esp32s3/include/hal/sigmadelta_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/sigmadelta_ll.h rename to components/hal/esp32s3/include/hal/sigmadelta_ll.h diff --git a/components/soc/src/esp32s3/include/hal/soc_ll.h b/components/hal/esp32s3/include/hal/soc_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/soc_ll.h rename to components/hal/esp32s3/include/hal/soc_ll.h diff --git a/components/soc/src/esp32s3/include/hal/spi_flash_ll.h b/components/hal/esp32s3/include/hal/spi_flash_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/spi_flash_ll.h rename to components/hal/esp32s3/include/hal/spi_flash_ll.h diff --git a/components/soc/src/esp32s3/include/hal/spi_ll.h b/components/hal/esp32s3/include/hal/spi_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/spi_ll.h rename to components/hal/esp32s3/include/hal/spi_ll.h diff --git a/components/soc/src/esp32s3/include/hal/spimem_flash_ll.h b/components/hal/esp32s3/include/hal/spimem_flash_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/spimem_flash_ll.h rename to components/hal/esp32s3/include/hal/spimem_flash_ll.h diff --git a/components/soc/src/esp32s3/include/hal/systimer_ll.h b/components/hal/esp32s3/include/hal/systimer_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/systimer_ll.h rename to components/hal/esp32s3/include/hal/systimer_ll.h diff --git a/components/soc/src/esp32s3/include/hal/timer_ll.h b/components/hal/esp32s3/include/hal/timer_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/timer_ll.h rename to components/hal/esp32s3/include/hal/timer_ll.h diff --git a/components/soc/src/esp32s3/include/hal/touch_sensor_hal.h b/components/hal/esp32s3/include/hal/touch_sensor_hal.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/touch_sensor_hal.h rename to components/hal/esp32s3/include/hal/touch_sensor_hal.h diff --git a/components/soc/src/esp32s3/include/hal/touch_sensor_ll.h b/components/hal/esp32s3/include/hal/touch_sensor_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/touch_sensor_ll.h rename to components/hal/esp32s3/include/hal/touch_sensor_ll.h diff --git a/components/soc/src/esp32s3/include/hal/twai_ll.h b/components/hal/esp32s3/include/hal/twai_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/twai_ll.h rename to components/hal/esp32s3/include/hal/twai_ll.h diff --git a/components/soc/src/esp32s3/include/hal/uart_ll.h b/components/hal/esp32s3/include/hal/uart_ll.h similarity index 100% rename from components/soc/src/esp32s3/include/hal/uart_ll.h rename to components/hal/esp32s3/include/hal/uart_ll.h diff --git a/components/soc/src/esp32s3/systimer_hal.c b/components/hal/esp32s3/systimer_hal.c similarity index 100% rename from components/soc/src/esp32s3/systimer_hal.c rename to components/hal/esp32s3/systimer_hal.c diff --git a/components/soc/src/esp32s3/touch_sensor_hal.c b/components/hal/esp32s3/touch_sensor_hal.c similarity index 100% rename from components/soc/src/esp32s3/touch_sensor_hal.c rename to components/hal/esp32s3/touch_sensor_hal.c diff --git a/components/soc/src/hal/gpio_hal.c b/components/hal/gpio_hal.c similarity index 100% rename from components/soc/src/hal/gpio_hal.c rename to components/hal/gpio_hal.c diff --git a/components/soc/src/hal/i2c_hal.c b/components/hal/i2c_hal.c similarity index 100% rename from components/soc/src/hal/i2c_hal.c rename to components/hal/i2c_hal.c diff --git a/components/soc/src/hal/i2c_hal_iram.c b/components/hal/i2c_hal_iram.c similarity index 100% rename from components/soc/src/hal/i2c_hal_iram.c rename to components/hal/i2c_hal_iram.c diff --git a/components/soc/src/hal/i2s_hal.c b/components/hal/i2s_hal.c similarity index 100% rename from components/soc/src/hal/i2s_hal.c rename to components/hal/i2s_hal.c diff --git a/components/soc/include/hal/adc_hal.h b/components/hal/include/hal/adc_hal.h similarity index 100% rename from components/soc/include/hal/adc_hal.h rename to components/hal/include/hal/adc_hal.h diff --git a/components/soc/include/hal/adc_types.h b/components/hal/include/hal/adc_types.h similarity index 100% rename from components/soc/include/hal/adc_types.h rename to components/hal/include/hal/adc_types.h diff --git a/components/soc/include/hal/brownout_hal.h b/components/hal/include/hal/brownout_hal.h similarity index 100% rename from components/soc/include/hal/brownout_hal.h rename to components/hal/include/hal/brownout_hal.h diff --git a/components/soc/include/hal/cpu_hal.h b/components/hal/include/hal/cpu_hal.h similarity index 100% rename from components/soc/include/hal/cpu_hal.h rename to components/hal/include/hal/cpu_hal.h diff --git a/components/soc/include/hal/cpu_types.h b/components/hal/include/hal/cpu_types.h similarity index 100% rename from components/soc/include/hal/cpu_types.h rename to components/hal/include/hal/cpu_types.h diff --git a/components/soc/include/hal/dac_hal.h b/components/hal/include/hal/dac_hal.h similarity index 100% rename from components/soc/include/hal/dac_hal.h rename to components/hal/include/hal/dac_hal.h diff --git a/components/soc/include/hal/dac_types.h b/components/hal/include/hal/dac_types.h similarity index 100% rename from components/soc/include/hal/dac_types.h rename to components/hal/include/hal/dac_types.h diff --git a/components/soc/include/hal/esp_flash_err.h b/components/hal/include/hal/esp_flash_err.h similarity index 100% rename from components/soc/include/hal/esp_flash_err.h rename to components/hal/include/hal/esp_flash_err.h diff --git a/components/soc/include/hal/gpio_hal.h b/components/hal/include/hal/gpio_hal.h similarity index 100% rename from components/soc/include/hal/gpio_hal.h rename to components/hal/include/hal/gpio_hal.h diff --git a/components/soc/include/hal/gpio_types.h b/components/hal/include/hal/gpio_types.h similarity index 100% rename from components/soc/include/hal/gpio_types.h rename to components/hal/include/hal/gpio_types.h diff --git a/components/soc/include/hal/hal_defs.h b/components/hal/include/hal/hal_defs.h similarity index 100% rename from components/soc/include/hal/hal_defs.h rename to components/hal/include/hal/hal_defs.h diff --git a/components/soc/include/hal/i2c_hal.h b/components/hal/include/hal/i2c_hal.h similarity index 100% rename from components/soc/include/hal/i2c_hal.h rename to components/hal/include/hal/i2c_hal.h diff --git a/components/soc/include/hal/i2c_types.h b/components/hal/include/hal/i2c_types.h similarity index 100% rename from components/soc/include/hal/i2c_types.h rename to components/hal/include/hal/i2c_types.h diff --git a/components/soc/include/hal/i2s_hal.h b/components/hal/include/hal/i2s_hal.h similarity index 100% rename from components/soc/include/hal/i2s_hal.h rename to components/hal/include/hal/i2s_hal.h diff --git a/components/soc/include/hal/i2s_types.h b/components/hal/include/hal/i2s_types.h similarity index 100% rename from components/soc/include/hal/i2s_types.h rename to components/hal/include/hal/i2s_types.h diff --git a/components/soc/include/hal/ledc_hal.h b/components/hal/include/hal/ledc_hal.h similarity index 100% rename from components/soc/include/hal/ledc_hal.h rename to components/hal/include/hal/ledc_hal.h diff --git a/components/soc/include/hal/ledc_types.h b/components/hal/include/hal/ledc_types.h similarity index 100% rename from components/soc/include/hal/ledc_types.h rename to components/hal/include/hal/ledc_types.h diff --git a/components/soc/include/hal/mcpwm_hal.h b/components/hal/include/hal/mcpwm_hal.h similarity index 100% rename from components/soc/include/hal/mcpwm_hal.h rename to components/hal/include/hal/mcpwm_hal.h diff --git a/components/soc/include/hal/mcpwm_types.h b/components/hal/include/hal/mcpwm_types.h similarity index 100% rename from components/soc/include/hal/mcpwm_types.h rename to components/hal/include/hal/mcpwm_types.h diff --git a/components/soc/include/hal/mpu_hal.h b/components/hal/include/hal/mpu_hal.h similarity index 100% rename from components/soc/include/hal/mpu_hal.h rename to components/hal/include/hal/mpu_hal.h diff --git a/components/soc/include/hal/mpu_types.h b/components/hal/include/hal/mpu_types.h similarity index 100% rename from components/soc/include/hal/mpu_types.h rename to components/hal/include/hal/mpu_types.h diff --git a/components/soc/include/hal/pcnt_hal.h b/components/hal/include/hal/pcnt_hal.h similarity index 100% rename from components/soc/include/hal/pcnt_hal.h rename to components/hal/include/hal/pcnt_hal.h diff --git a/components/soc/include/hal/pcnt_types.h b/components/hal/include/hal/pcnt_types.h similarity index 100% rename from components/soc/include/hal/pcnt_types.h rename to components/hal/include/hal/pcnt_types.h diff --git a/components/soc/include/hal/readme.md b/components/hal/include/hal/readme.md similarity index 100% rename from components/soc/include/hal/readme.md rename to components/hal/include/hal/readme.md diff --git a/components/soc/include/hal/rmt_hal.h b/components/hal/include/hal/rmt_hal.h similarity index 100% rename from components/soc/include/hal/rmt_hal.h rename to components/hal/include/hal/rmt_hal.h diff --git a/components/soc/include/hal/rmt_types.h b/components/hal/include/hal/rmt_types.h similarity index 100% rename from components/soc/include/hal/rmt_types.h rename to components/hal/include/hal/rmt_types.h diff --git a/components/soc/include/hal/rtc_io_hal.h b/components/hal/include/hal/rtc_io_hal.h similarity index 100% rename from components/soc/include/hal/rtc_io_hal.h rename to components/hal/include/hal/rtc_io_hal.h diff --git a/components/soc/include/hal/rtc_io_types.h b/components/hal/include/hal/rtc_io_types.h similarity index 100% rename from components/soc/include/hal/rtc_io_types.h rename to components/hal/include/hal/rtc_io_types.h diff --git a/components/soc/include/hal/sdio_slave_hal.h b/components/hal/include/hal/sdio_slave_hal.h similarity index 100% rename from components/soc/include/hal/sdio_slave_hal.h rename to components/hal/include/hal/sdio_slave_hal.h diff --git a/components/soc/include/hal/sdio_slave_ll.h b/components/hal/include/hal/sdio_slave_ll.h similarity index 100% rename from components/soc/include/hal/sdio_slave_ll.h rename to components/hal/include/hal/sdio_slave_ll.h diff --git a/components/soc/include/hal/sdio_slave_types.h b/components/hal/include/hal/sdio_slave_types.h similarity index 100% rename from components/soc/include/hal/sdio_slave_types.h rename to components/hal/include/hal/sdio_slave_types.h diff --git a/components/soc/include/hal/sigmadelta_hal.h b/components/hal/include/hal/sigmadelta_hal.h similarity index 100% rename from components/soc/include/hal/sigmadelta_hal.h rename to components/hal/include/hal/sigmadelta_hal.h diff --git a/components/soc/include/hal/sigmadelta_types.h b/components/hal/include/hal/sigmadelta_types.h similarity index 100% rename from components/soc/include/hal/sigmadelta_types.h rename to components/hal/include/hal/sigmadelta_types.h diff --git a/components/soc/include/hal/soc_hal.h b/components/hal/include/hal/soc_hal.h similarity index 100% rename from components/soc/include/hal/soc_hal.h rename to components/hal/include/hal/soc_hal.h diff --git a/components/soc/include/hal/spi_flash_hal.h b/components/hal/include/hal/spi_flash_hal.h similarity index 100% rename from components/soc/include/hal/spi_flash_hal.h rename to components/hal/include/hal/spi_flash_hal.h diff --git a/components/soc/include/hal/spi_flash_types.h b/components/hal/include/hal/spi_flash_types.h similarity index 100% rename from components/soc/include/hal/spi_flash_types.h rename to components/hal/include/hal/spi_flash_types.h diff --git a/components/soc/include/hal/spi_hal.h b/components/hal/include/hal/spi_hal.h similarity index 100% rename from components/soc/include/hal/spi_hal.h rename to components/hal/include/hal/spi_hal.h diff --git a/components/soc/include/hal/spi_slave_hal.h b/components/hal/include/hal/spi_slave_hal.h similarity index 100% rename from components/soc/include/hal/spi_slave_hal.h rename to components/hal/include/hal/spi_slave_hal.h diff --git a/components/soc/include/hal/spi_slave_hd_hal.h b/components/hal/include/hal/spi_slave_hd_hal.h similarity index 100% rename from components/soc/include/hal/spi_slave_hd_hal.h rename to components/hal/include/hal/spi_slave_hd_hal.h diff --git a/components/soc/include/hal/spi_types.h b/components/hal/include/hal/spi_types.h similarity index 100% rename from components/soc/include/hal/spi_types.h rename to components/hal/include/hal/spi_types.h diff --git a/components/soc/include/hal/systimer_hal.h b/components/hal/include/hal/systimer_hal.h similarity index 100% rename from components/soc/include/hal/systimer_hal.h rename to components/hal/include/hal/systimer_hal.h diff --git a/components/soc/include/hal/systimer_types.h b/components/hal/include/hal/systimer_types.h similarity index 100% rename from components/soc/include/hal/systimer_types.h rename to components/hal/include/hal/systimer_types.h diff --git a/components/soc/include/hal/timer_hal.h b/components/hal/include/hal/timer_hal.h similarity index 100% rename from components/soc/include/hal/timer_hal.h rename to components/hal/include/hal/timer_hal.h diff --git a/components/soc/include/hal/timer_types.h b/components/hal/include/hal/timer_types.h similarity index 100% rename from components/soc/include/hal/timer_types.h rename to components/hal/include/hal/timer_types.h diff --git a/components/soc/include/hal/touch_sensor_hal.h b/components/hal/include/hal/touch_sensor_hal.h similarity index 100% rename from components/soc/include/hal/touch_sensor_hal.h rename to components/hal/include/hal/touch_sensor_hal.h diff --git a/components/soc/include/hal/touch_sensor_types.h b/components/hal/include/hal/touch_sensor_types.h similarity index 100% rename from components/soc/include/hal/touch_sensor_types.h rename to components/hal/include/hal/touch_sensor_types.h diff --git a/components/soc/include/hal/twai_hal.h b/components/hal/include/hal/twai_hal.h similarity index 100% rename from components/soc/include/hal/twai_hal.h rename to components/hal/include/hal/twai_hal.h diff --git a/components/soc/include/hal/twai_types.h b/components/hal/include/hal/twai_types.h similarity index 100% rename from components/soc/include/hal/twai_types.h rename to components/hal/include/hal/twai_types.h diff --git a/components/soc/include/hal/uart_hal.h b/components/hal/include/hal/uart_hal.h similarity index 100% rename from components/soc/include/hal/uart_hal.h rename to components/hal/include/hal/uart_hal.h diff --git a/components/soc/include/hal/uart_types.h b/components/hal/include/hal/uart_types.h similarity index 100% rename from components/soc/include/hal/uart_types.h rename to components/hal/include/hal/uart_types.h diff --git a/components/soc/include/hal/usb_hal.h b/components/hal/include/hal/usb_hal.h similarity index 100% rename from components/soc/include/hal/usb_hal.h rename to components/hal/include/hal/usb_hal.h diff --git a/components/soc/include/hal/wdt_hal.h b/components/hal/include/hal/wdt_hal.h similarity index 100% rename from components/soc/include/hal/wdt_hal.h rename to components/hal/include/hal/wdt_hal.h diff --git a/components/soc/include/hal/wdt_types.h b/components/hal/include/hal/wdt_types.h similarity index 100% rename from components/soc/include/hal/wdt_types.h rename to components/hal/include/hal/wdt_types.h diff --git a/components/soc/src/hal/ledc_hal.c b/components/hal/ledc_hal.c similarity index 100% rename from components/soc/src/hal/ledc_hal.c rename to components/hal/ledc_hal.c diff --git a/components/soc/src/hal/ledc_hal_iram.c b/components/hal/ledc_hal_iram.c similarity index 100% rename from components/soc/src/hal/ledc_hal_iram.c rename to components/hal/ledc_hal_iram.c diff --git a/components/hal/linker.lf b/components/hal/linker.lf new file mode 100644 index 0000000000..544e08553e --- /dev/null +++ b/components/hal/linker.lf @@ -0,0 +1,17 @@ +[mapping:hal] +archive: libhal.a +entries: + spi_hal_iram (noflash) + spi_slave_hal_iram (noflash) + if UART_ISR_IN_IRAM = y: + uart_hal_iram (noflash) + else: + uart_hal_iram (default) + spi_flash_hal_iram (noflash) + ledc_hal_iram (noflash) + i2c_hal_iram (noflash) + spi_flash_hal_gpspi (noflash) + cpu_hal (noflash) + soc_hal (noflash) + wdt_hal_iram (noflash) + systimer_hal (noflash) diff --git a/components/soc/src/hal/mcpwm_hal.c b/components/hal/mcpwm_hal.c similarity index 100% rename from components/soc/src/hal/mcpwm_hal.c rename to components/hal/mcpwm_hal.c diff --git a/components/soc/src/hal/mpu_hal.c b/components/hal/mpu_hal.c similarity index 100% rename from components/soc/src/hal/mpu_hal.c rename to components/hal/mpu_hal.c diff --git a/components/soc/src/hal/pcnt_hal.c b/components/hal/pcnt_hal.c similarity index 100% rename from components/soc/src/hal/pcnt_hal.c rename to components/hal/pcnt_hal.c diff --git a/components/soc/src/hal/rmt_hal.c b/components/hal/rmt_hal.c similarity index 100% rename from components/soc/src/hal/rmt_hal.c rename to components/hal/rmt_hal.c diff --git a/components/soc/src/hal/rtc_io_hal.c b/components/hal/rtc_io_hal.c similarity index 100% rename from components/soc/src/hal/rtc_io_hal.c rename to components/hal/rtc_io_hal.c diff --git a/components/soc/src/hal/sdio_slave_hal.c b/components/hal/sdio_slave_hal.c similarity index 100% rename from components/soc/src/hal/sdio_slave_hal.c rename to components/hal/sdio_slave_hal.c diff --git a/components/soc/src/hal/sigmadelta_hal.c b/components/hal/sigmadelta_hal.c similarity index 100% rename from components/soc/src/hal/sigmadelta_hal.c rename to components/hal/sigmadelta_hal.c diff --git a/components/soc/src/hal/soc_hal.c b/components/hal/soc_hal.c similarity index 100% rename from components/soc/src/hal/soc_hal.c rename to components/hal/soc_hal.c diff --git a/components/soc/src/hal/spi_flash_hal.c b/components/hal/spi_flash_hal.c similarity index 100% rename from components/soc/src/hal/spi_flash_hal.c rename to components/hal/spi_flash_hal.c diff --git a/components/soc/src/hal/spi_flash_hal_common.inc b/components/hal/spi_flash_hal_common.inc similarity index 100% rename from components/soc/src/hal/spi_flash_hal_common.inc rename to components/hal/spi_flash_hal_common.inc diff --git a/components/soc/src/hal/spi_flash_hal_gpspi.c b/components/hal/spi_flash_hal_gpspi.c similarity index 100% rename from components/soc/src/hal/spi_flash_hal_gpspi.c rename to components/hal/spi_flash_hal_gpspi.c diff --git a/components/soc/src/hal/spi_flash_hal_iram.c b/components/hal/spi_flash_hal_iram.c similarity index 100% rename from components/soc/src/hal/spi_flash_hal_iram.c rename to components/hal/spi_flash_hal_iram.c diff --git a/components/soc/src/hal/spi_hal.c b/components/hal/spi_hal.c similarity index 100% rename from components/soc/src/hal/spi_hal.c rename to components/hal/spi_hal.c diff --git a/components/soc/src/hal/spi_hal_iram.c b/components/hal/spi_hal_iram.c similarity index 100% rename from components/soc/src/hal/spi_hal_iram.c rename to components/hal/spi_hal_iram.c diff --git a/components/soc/src/hal/spi_slave_hal.c b/components/hal/spi_slave_hal.c similarity index 100% rename from components/soc/src/hal/spi_slave_hal.c rename to components/hal/spi_slave_hal.c diff --git a/components/soc/src/hal/spi_slave_hal_iram.c b/components/hal/spi_slave_hal_iram.c similarity index 100% rename from components/soc/src/hal/spi_slave_hal_iram.c rename to components/hal/spi_slave_hal_iram.c diff --git a/components/soc/src/hal/spi_slave_hd_hal.c b/components/hal/spi_slave_hd_hal.c similarity index 100% rename from components/soc/src/hal/spi_slave_hd_hal.c rename to components/hal/spi_slave_hd_hal.c diff --git a/components/soc/src/hal/timer_hal.c b/components/hal/timer_hal.c similarity index 100% rename from components/soc/src/hal/timer_hal.c rename to components/hal/timer_hal.c diff --git a/components/soc/src/hal/touch_sensor_hal.c b/components/hal/touch_sensor_hal.c similarity index 100% rename from components/soc/src/hal/touch_sensor_hal.c rename to components/hal/touch_sensor_hal.c diff --git a/components/soc/src/hal/twai_hal.c b/components/hal/twai_hal.c similarity index 100% rename from components/soc/src/hal/twai_hal.c rename to components/hal/twai_hal.c diff --git a/components/soc/src/hal/uart_hal.c b/components/hal/uart_hal.c similarity index 100% rename from components/soc/src/hal/uart_hal.c rename to components/hal/uart_hal.c diff --git a/components/soc/src/hal/uart_hal_iram.c b/components/hal/uart_hal_iram.c similarity index 100% rename from components/soc/src/hal/uart_hal_iram.c rename to components/hal/uart_hal_iram.c diff --git a/components/soc/src/hal/wdt_hal_iram.c b/components/hal/wdt_hal_iram.c similarity index 100% rename from components/soc/src/hal/wdt_hal_iram.c rename to components/hal/wdt_hal_iram.c diff --git a/components/nvs_flash/test_nvs_host/Makefile b/components/nvs_flash/test_nvs_host/Makefile index be761dd168..430eecdc83 100644 --- a/components/nvs_flash/test_nvs_host/Makefile +++ b/components/nvs_flash/test_nvs_host/Makefile @@ -36,7 +36,7 @@ else COMPILER := gcc endif -CPPFLAGS += -I../include -I../src -I./ -I../../esp_common/include -I../../esp32/include -I ../../mbedtls/mbedtls/include -I ../../spi_flash/include -I ../../soc/include -I ../../xtensa/include -I ../../../tools/catch -fprofile-arcs -ftest-coverage +CPPFLAGS += -I../include -I../src -I./ -I../../esp_common/include -I../../esp32/include -I ../../mbedtls/mbedtls/include -I ../../spi_flash/include -I ../../hal/include -I ../../xtensa/include -I ../../../tools/catch -fprofile-arcs -ftest-coverage CFLAGS += -fprofile-arcs -ftest-coverage CXXFLAGS += -std=c++11 -Wall -Werror LDFLAGS += -lstdc++ -Wall -fprofile-arcs -ftest-coverage diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt index c5d186e13f..956866dfbb 100644 --- a/components/soc/CMakeLists.txt +++ b/components/soc/CMakeLists.txt @@ -3,51 +3,19 @@ idf_build_get_property(target IDF_TARGET) idf_component_register(SRCS "src/cpu_util.c" "src/memory_layout_utils.c" "src/lldesc.c" - "src/hal/cpu_hal.c" - "src/hal/rmt_hal.c" - "src/hal/rtc_io_hal.c" - "src/hal/dac_hal.c" - "src/hal/adc_hal.c" - "src/hal/spi_hal.c" - "src/hal/spi_hal_iram.c" - "src/hal/spi_slave_hal.c" - "src/hal/spi_slave_hal_iram.c" - "src/hal/touch_sensor_hal.c" "src/soc_include_legacy_warn.c" - "src/hal/pcnt_hal.c" - "src/hal/i2s_hal.c" - "src/hal/sigmadelta_hal.c" - "src/hal/timer_hal.c" - "src/hal/ledc_hal.c" - "src/hal/ledc_hal_iram.c" - "src/hal/i2c_hal.c" - "src/hal/i2c_hal_iram.c" - "src/hal/gpio_hal.c" - "src/hal/uart_hal.c" - "src/hal/uart_hal_iram.c" - "src/hal/spi_flash_hal.c" - "src/hal/spi_flash_hal_iram.c" - "src/hal/mpu_hal.c" - "src/hal/soc_hal.c" - "src/hal/wdt_hal_iram.c" "src/compare_set.c" - "src/hal/twai_hal.c" + REQUIRES hal #cpu.h directly includes HAL header PRIV_REQUIRES ${target} LDFRAGMENTS linker.lf) -if(CONFIG_IDF_TARGET_ESP32) - target_sources(${COMPONENT_LIB} PRIVATE "src/hal/mcpwm_hal.c" - "src/hal/sdio_slave_hal.c") -elseif(CONFIG_IDF_TARGET_ESP32S2) - target_sources(${COMPONENT_LIB} PRIVATE "src/hal/spi_flash_hal_gpspi.c") - target_sources(${COMPONENT_LIB} PRIVATE "src/hal/spi_slave_hd_hal.c") -endif() # Since there can be chip-specific HAL headers which can include the common # HAL header via include_next, process the build scripts here first so that # include directories appear first in the compile command. add_subdirectory(src/${target}) target_include_directories(${COMPONENT_LIB} PUBLIC include) +target_link_libraries(${COMPONENT_LIB} PRIVATE idf::hal) add_subdirectory(soc) target_link_libraries(${COMPONENT_LIB} PUBLIC "soc_${target}") diff --git a/components/soc/component.mk b/components/soc/component.mk index cd42c616c8..23d74c38e1 100644 --- a/components/soc/component.mk +++ b/components/soc/component.mk @@ -1,8 +1,7 @@ SOC_NAME := $(IDF_TARGET) -COMPONENT_SRCDIRS := src src/hal +COMPONENT_SRCDIRS := src COMPONENT_ADD_INCLUDEDIRS := -COMPONENT_OBJEXCLUDE += src/hal/spi_slave_hd_hal.o # Since there can be chip-specific HAL headers which can include the common # HAL header via include_next, process the build scripts here first so that diff --git a/components/soc/linker.lf b/components/soc/linker.lf index 4a5e871df8..19e55bbd89 100644 --- a/components/soc/linker.lf +++ b/components/soc/linker.lf @@ -9,18 +9,4 @@ entries: rtc_sleep (noflash_text) rtc_time (noflash_text) rtc_wdt (noflash_text) - spi_hal_iram (noflash) - spi_slave_hal_iram (noflash) - if UART_ISR_IN_IRAM = y: - uart_hal_iram (noflash) - else: - uart_hal_iram (default) - spi_flash_hal_iram (noflash) - ledc_hal_iram (noflash) - i2c_hal_iram (noflash) - spi_flash_hal_gpspi (noflash) lldesc (noflash) - cpu_hal (noflash) - soc_hal (noflash) - wdt_hal_iram (noflash) - systimer_hal (noflash) diff --git a/components/soc/src/esp32/CMakeLists.txt b/components/soc/src/esp32/CMakeLists.txt index 24a210aea1..3f1279d3f6 100644 --- a/components/soc/src/esp32/CMakeLists.txt +++ b/components/soc/src/esp32/CMakeLists.txt @@ -1,5 +1,4 @@ -set(srcs "adc_hal.c" - "brownout_hal.c" +set(srcs "rtc_clk.c" "rtc_clk_init.c" "rtc_init.c" @@ -8,17 +7,12 @@ set(srcs "adc_hal.c" "rtc_time.c" "rtc_wdt.c" "soc_memory_layout.c" - "touch_sensor_hal.c") - -if(NOT BOOTLOADER_BUILD AND CONFIG_ETH_USE_ESP32_EMAC) - list(APPEND srcs "emac_hal.c") -endif() +) add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") target_include_directories(${COMPONENT_LIB} PUBLIC . include) -target_include_directories(${COMPONENT_LIB} PRIVATE ../hal) if(NOT CMAKE_BUILD_EARLY_EXPANSION) set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES diff --git a/components/soc/src/esp32s2/CMakeLists.txt b/components/soc/src/esp32s2/CMakeLists.txt index 6aa627e584..b5313224b7 100644 --- a/components/soc/src/esp32s2/CMakeLists.txt +++ b/components/soc/src/esp32s2/CMakeLists.txt @@ -1,7 +1,5 @@ -set(srcs "adc_hal.c" +set(srcs "dac_hal.c" - "brownout_hal.c" - "cp_dma_hal.c" "rtc_clk.c" "rtc_clk_init.c" "rtc_init.c" @@ -9,16 +7,12 @@ set(srcs "adc_hal.c" "rtc_sleep.c" "rtc_time.c" "rtc_wdt.c" - "soc_memory_layout.c" - "systimer_hal.c" - "touch_sensor_hal.c" - "usb_hal.c") + "soc_memory_layout.c") add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") target_include_directories(${COMPONENT_LIB} PUBLIC . include) -target_include_directories(${COMPONENT_LIB} PRIVATE ../hal) if(NOT CMAKE_BUILD_EARLY_EXPANSION) set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES diff --git a/components/soc/src/esp32s3/CMakeLists.txt b/components/soc/src/esp32s3/CMakeLists.txt index 931d47d7bd..972d69f96b 100644 --- a/components/soc/src/esp32s3/CMakeLists.txt +++ b/components/soc/src/esp32s3/CMakeLists.txt @@ -1,19 +1,16 @@ -set(srcs "brownout_hal.c" +set(srcs "rtc_clk_init.c" "rtc_clk.c" "rtc_init.c" "rtc_pm.c" "rtc_sleep.c" "rtc_time.c" - "soc_memory_layout.c" - "systimer_hal.c" - "touch_sensor_hal.c") + "soc_memory_layout.c") add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}") target_sources(${COMPONENT_LIB} PRIVATE "${srcs}") target_include_directories(${COMPONENT_LIB} PUBLIC . include) -target_include_directories(${COMPONENT_LIB} PRIVATE ../hal) if(NOT CMAKE_BUILD_EARLY_EXPANSION) set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/rtc_clk.c" PROPERTIES diff --git a/components/spi_flash/CMakeLists.txt b/components/spi_flash/CMakeLists.txt index 2e2d6e6a4b..b123609940 100644 --- a/components/spi_flash/CMakeLists.txt +++ b/components/spi_flash/CMakeLists.txt @@ -45,6 +45,7 @@ else() endif() idf_component_register(SRCS "${srcs}" + REQUIRES hal PRIV_REQUIRES "${priv_requires}" INCLUDE_DIRS include PRIV_INCLUDE_DIRS private_include diff --git a/components/spi_flash/sim/Makefile.files b/components/spi_flash/sim/Makefile.files index 98b55c5549..036cc627e4 100644 --- a/components/spi_flash/sim/Makefile.files +++ b/components/spi_flash/sim/Makefile.files @@ -36,5 +36,6 @@ INCLUDE_DIRS := \ esp_timer/include \ bootloader_support/include \ app_update/include \ + hal/include \ spi_flash/include \ ) diff --git a/components/spi_flash/sim/stubs/Makefile.files b/components/spi_flash/sim/stubs/Makefile.files index 8807a39bd5..8fdf44c025 100644 --- a/components/spi_flash/sim/stubs/Makefile.files +++ b/components/spi_flash/sim/stubs/Makefile.files @@ -30,6 +30,7 @@ INCLUDE_DIRS := \ esp_timer/include \ bootloader_support/include \ app_update/include \ + hal/include \ spi_flash/include \ ) diff --git a/components/spiffs/test_spiffs_host/Makefile.files b/components/spiffs/test_spiffs_host/Makefile.files index f7c8647665..c6f9b69b38 100644 --- a/components/spiffs/test_spiffs_host/Makefile.files +++ b/components/spiffs/test_spiffs_host/Makefile.files @@ -35,5 +35,6 @@ INCLUDE_DIRS := \ bootloader_support/include \ app_update/include \ spi_flash/include \ + hal/include \ wear_levelling/include \ ) diff --git a/components/wear_levelling/test_wl_host/Makefile.files b/components/wear_levelling/test_wl_host/Makefile.files index 132d5f1d6a..35428a419b 100644 --- a/components/wear_levelling/test_wl_host/Makefile.files +++ b/components/wear_levelling/test_wl_host/Makefile.files @@ -33,5 +33,6 @@ INCLUDE_DIRS := \ esp32/include \ bootloader_support/include \ app_update/include \ + hal/include \ spi_flash/include \ ) diff --git a/components/xtensa/CMakeLists.txt b/components/xtensa/CMakeLists.txt index 738f14d0f5..41d97a6871 100644 --- a/components/xtensa/CMakeLists.txt +++ b/components/xtensa/CMakeLists.txt @@ -25,5 +25,5 @@ idf_component_register(SRCS ${srcs} PRIV_REQUIRES ${priv_requires}) if(NOT BOOTLOADER_BUILD) - target_link_libraries(${COMPONENT_LIB} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${target}/libhal.a") + target_link_libraries(${COMPONENT_LIB} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${target}/libxt_hal.a") endif() diff --git a/components/xtensa/component.mk b/components/xtensa/component.mk index 5bb61224a8..524610edb6 100644 --- a/components/xtensa/component.mk +++ b/components/xtensa/component.mk @@ -1,6 +1,6 @@ COMPONENT_ADD_INCLUDEDIRS := include esp32/include -COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/esp32/libhal.a +COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/esp32/libxt_hal.a COMPONENT_ADD_LDFRAGMENTS += linker.lf diff --git a/components/xtensa/esp32/libhal.a b/components/xtensa/esp32/libxt_hal.a similarity index 100% rename from components/xtensa/esp32/libhal.a rename to components/xtensa/esp32/libxt_hal.a diff --git a/components/xtensa/esp32s2/libhal.a b/components/xtensa/esp32s2/libxt_hal.a similarity index 100% rename from components/xtensa/esp32s2/libhal.a rename to components/xtensa/esp32s2/libxt_hal.a diff --git a/components/xtensa/esp32s3/libhal.a b/components/xtensa/esp32s3/libxt_hal.a similarity index 100% rename from components/xtensa/esp32s3/libhal.a rename to components/xtensa/esp32s3/libxt_hal.a diff --git a/components/xtensa/linker.lf b/components/xtensa/linker.lf index a721ac41ba..3ab5bc7c7a 100644 --- a/components/xtensa/linker.lf +++ b/components/xtensa/linker.lf @@ -4,7 +4,7 @@ entries: eri (noflash_text) stdatomic (noflash) -[mapping:hal] -archive: libhal.a +[mapping:xt_hal] +archive: libxt_hal.a entries: * (noflash_text) diff --git a/docs/Doxyfile b/docs/Doxyfile index c5e1d8effe..85c8776756 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -100,7 +100,6 @@ INPUT = \ $(IDF_PATH)/components/driver/include/driver/i2s.h \ $(IDF_PATH)/components/driver/include/driver/ledc.h \ $(IDF_PATH)/components/driver/include/driver/mcpwm.h \ - $(IDF_PATH)/components/soc/include/hal/mcpwm_types.h \ $(IDF_PATH)/components/driver/include/driver/pcnt.h \ $(IDF_PATH)/components/driver/include/driver/rmt.h \ $(IDF_PATH)/components/driver/include/driver/sigmadelta.h \ @@ -122,21 +121,22 @@ INPUT = \ $(IDF_PATH)/components/esp32s2/include/cp_dma.h \ $(IDF_PATH)/components/esp32s2/include/esp_hmac.h \ $(IDF_PATH)/components/esp32s2/include/esp_ds.h \ - $(IDF_PATH)/components/soc/include/hal/rmt_types.h \ - $(IDF_PATH)/components/soc/include/hal/spi_types.h \ - $(IDF_PATH)/components/soc/include/hal/pcnt_types.h \ - $(IDF_PATH)/components/soc/include/hal/i2s_types.h \ - $(IDF_PATH)/components/soc/include/hal/rtc_io_types.h \ - $(IDF_PATH)/components/soc/include/hal/sigmadelta_types.h \ - $(IDF_PATH)/components/soc/include/hal/timer_types.h \ - $(IDF_PATH)/components/soc/include/hal/ledc_types.h \ - $(IDF_PATH)/components/soc/include/hal/i2c_types.h \ - $(IDF_PATH)/components/soc/include/hal/dac_types.h \ - $(IDF_PATH)/components/soc/include/hal/adc_types.h \ - $(IDF_PATH)/components/soc/include/hal/gpio_types.h \ - $(IDF_PATH)/components/soc/include/hal/uart_types.h \ - $(IDF_PATH)/components/soc/include/hal/twai_types.h \ - $(IDF_PATH)/components/soc/include/hal/touch_sensor_types.h \ + $(IDF_PATH)/components/hal/include/hal/gpio_types.h \ + $(IDF_PATH)/components/hal/include/hal/uart_types.h \ + $(IDF_PATH)/components/hal/include/hal/mcpwm_types.h \ + $(IDF_PATH)/components/hal/include/hal/rmt_types.h \ + $(IDF_PATH)/components/hal/include/hal/spi_types.h \ + $(IDF_PATH)/components/hal/include/hal/pcnt_types.h \ + $(IDF_PATH)/components/hal/include/hal/i2s_types.h \ + $(IDF_PATH)/components/hal/include/hal/rtc_io_types.h \ + $(IDF_PATH)/components/hal/include/hal/sigmadelta_types.h \ + $(IDF_PATH)/components/hal/include/hal/timer_types.h \ + $(IDF_PATH)/components/hal/include/hal/ledc_types.h \ + $(IDF_PATH)/components/hal/include/hal/i2c_types.h \ + $(IDF_PATH)/components/hal/include/hal/dac_types.h \ + $(IDF_PATH)/components/hal/include/hal/adc_types.h \ + $(IDF_PATH)/components/hal/include/hal/twai_types.h \ + $(IDF_PATH)/components/hal/include/hal/touch_sensor_types.h \ $(IDF_PATH)/components/soc/soc/esp32/include/soc/adc_channel.h \ $(IDF_PATH)/components/soc/soc/esp32/include/soc/dac_channel.h \ $(IDF_PATH)/components/soc/soc/esp32/include/soc/touch_sensor_channel.h \ @@ -197,7 +197,7 @@ INPUT = \ $(IDF_PATH)/components/spi_flash/include/esp_flash.h \ $(IDF_PATH)/components/spi_flash/include/esp_partition.h \ $(IDF_PATH)/components/bootloader_support/include/esp_flash_encrypt.h \ - $(IDF_PATH)/components/soc/include/hal/spi_flash_types.h \ + $(IDF_PATH)/components/hal/include/hal/spi_flash_types.h \ ## SPIFFS $(IDF_PATH)/components/spiffs/include/esp_spiffs.h \ ## SD/MMC Card Host @@ -207,7 +207,7 @@ INPUT = \ $(IDF_PATH)/components/driver/include/driver/sdspi_host.h \ ## SDIO slave $(IDF_PATH)/components/driver/include/driver/sdio_slave.h \ - $(IDF_PATH)/components/soc/include/hal/sdio_slave_types.h \ + $(IDF_PATH)/components/hal/include/hal/sdio_slave_types.h \ ## Non-Volatile Storage $(IDF_PATH)/components/nvs_flash/include/nvs.h \ $(IDF_PATH)/components/nvs_flash/include/nvs_flash.h \ diff --git a/docs/en/api-guides/hardware-abstraction.rst b/docs/en/api-guides/hardware-abstraction.rst index 969aab64b6..29a201ba35 100644 --- a/docs/en/api-guides/hardware-abstraction.rst +++ b/docs/en/api-guides/hardware-abstraction.rst @@ -26,7 +26,7 @@ Hardware abstraction in ESP-IDF is comprised of the following layers, ordered fr - Hardware Abstraction Layer (HAL) - Driver Layers -The LL Layer, and HAL are entirely contained within the ``soc`` component. Each layer is dependent on the layer below it (i.e, driver depends on HAL, HAL depends on LL, LL depends on the register header files). +The LL Layer, and HAL are entirely contained within the ``hal`` component. Each layer is dependent on the layer below it (i.e, driver depends on HAL, HAL depends on LL, LL depends on the register header files). For a particular peripheral ``xxx``, its hardware abstraction will generally consist of the header files described in the table below. Files that are **Target Specific** will have a separate implementation for each target (i.e., a separate copy for each chip). However, the ``#include`` directive will still be target-independent (i.e., will be the same for different targets) as the build system will automatically include the correct version of the header and source files. diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index 1895a01e3e..9f0fe97b10 100644 --- a/tools/ci/check_public_headers_exceptions.txt +++ b/tools/ci/check_public_headers_exceptions.txt @@ -12,7 +12,7 @@ components/freertos/xtensa/include/freertos/ components/log/include/esp_log_internal.h -components/soc/include/hal/ +components/hal/ components/soc/include/soc/ components/esp_rom/include/esp32s2/rom/rsa_pss.h @@ -104,10 +104,6 @@ components/lwip/lwip/src/include/lwip/prot/nd6.h components/lwip/port/esp32/include/netif/dhcp_state.h components/soc/src/esp32/rtc_clk_common.h components/soc/src/esp32/i2c_rtc_clk.h -components/soc/src/esp32/include/hal/cpu_ll.h -components/soc/src/esp32/include/hal/timer_ll.h -components/soc/src/esp32/include/hal/cpu_ll.h -components/soc/src/esp32/include/hal/timer_ll.h components/esp_rom/include/esp32/rom/sha.h components/esp_rom/include/esp32/rom/secure_boot.h components/esp_rom/include/esp32s2/rom/spi_flash.h diff --git a/tools/cmake/build.cmake b/tools/cmake/build.cmake index 4e29c8625d..707a2e6a87 100644 --- a/tools/cmake/build.cmake +++ b/tools/cmake/build.cmake @@ -154,7 +154,7 @@ function(__build_init idf_path) # Set components required by all other components in the build # # - lwip is here so that #include works without any special provisions - set(requires_common cxx newlib freertos heap log lwip soc esp_rom esp_common esp_system xtensa) + set(requires_common cxx newlib freertos heap log lwip soc hal esp_rom esp_common esp_system xtensa) idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${requires_common}") __build_get_idf_git_revision()