Merge branch 'feat/p4_eco5_soc_part1' into 'master'

p4: soc support (part 1, move hw ver1 registers to `hw_ver1` dir) See merge request espressif/esp-idf!40518
2025-08-03 12:44:33 +02:00 · 2025-07-18 01:51:31 +00:00
parent 5636a2fad2 9477f88a0d
commit bfcba51ca1
193 changed files with 83 additions and 36 deletions
--- a/components/hal/esp32p4/include/hal/uart_ll.h
+++ b/components/hal/esp32p4/include/hal/uart_ll.h
@@ -10,6 +10,7 @@

 #pragma once

+#include <stdint.h>
 #include "esp_attr.h"
 #include "hal/misc.h"
 #include "hal/assert.h"
--- a/components/soc/CMakeLists.txt
+++ b/components/soc/CMakeLists.txt
@@ -18,10 +18,22 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${target_folder}/include")
    list(APPEND includes "${target_folder}/include")
 endif()

-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${target_folder}/register")
 # register headers that generated by script from CSV
+if(CONFIG_IDF_TARGET_ESP32P4)
+    if(DEFINED COMPONENTS AND "esp_hw_support" IN_LIST COMPONENTS)
+        if(CONFIG_ESP32P4_SELECTS_REV_LESS_V2)
+            list(APPEND includes "${target_folder}/register/hw_ver1")
+        else()
+            list(APPEND includes "${target_folder}/register/hw_ver2")
+        endif()
+    else()
+        list(APPEND includes "${target_folder}/register/hw_ver1")
+    endif()
+else()
+    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${target_folder}/register")
        list(APPEND includes "${target_folder}/register")
    endif()
+endif()

 if(target STREQUAL "esp32")
    list(APPEND srcs "${target_folder}/dport_access.c")
--- a/components/soc/esp32p4/register/hw_ver1/soc/adc_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/adc_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/adc_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/adc_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/aes_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/aes_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/aes_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/aes_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ahb_dma_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ahb_dma_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ahb_dma_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ahb_dma_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/assist_debug_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/assist_debug_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/assist_debug_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/assist_debug_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/axi_dma_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/axi_dma_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/axi_dma_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/axi_dma_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/bitscrambler_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/bitscrambler_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/bitscrambler_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/bitscrambler_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/cache_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/cache_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/cache_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/cache_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/dma2d_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/dma2d_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/dma2d_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/dma2d_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/dma_pms_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/dma_pms_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/dma_pms_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/dma_pms_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ds_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ds_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ds_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ds_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/dw_gdma_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/dw_gdma_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/dw_gdma_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/dw_gdma_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ecc_mult_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ecc_mult_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ecc_mult_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ecc_mult_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ecdsa_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ecdsa_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ecdsa_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ecdsa_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/efuse_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/efuse_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/efuse_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/efuse_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/emac_dma_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/emac_dma_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/emac_mac_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/emac_mac_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/emac_ptp_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/emac_ptp_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/gpio_ext_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/gpio_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/gpio_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/gpio_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/gpio_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/h264_dma_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/h264_dma_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/h264_dma_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/h264_dma_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/h264_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/h264_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/h264_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/h264_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hmac_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hmac_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hmac_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hmac_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hp2lp_peri_pms_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hp2lp_peri_pms_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hp2lp_peri_pms_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hp2lp_peri_pms_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hp_sys_clkrst_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hp_sys_clkrst_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hp_sys_clkrst_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hp_sys_clkrst_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hp_system_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hp_system_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/hp_system_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/hp_system_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/huk_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/huk_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/huk_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/huk_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i2c_ana_mst_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i2c_ana_mst_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i2c_ana_mst_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i2c_ana_mst_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i2c_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i2c_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i2c_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i2c_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i2s_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i2s_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i2s_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i2s_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_mem_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_mem_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_mem_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_mem_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i3c_mst_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i3c_slv_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i3c_slv_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/i3c_slv_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/i3c_slv_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_qos_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_qos_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_qos_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_qos_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/icm_sys_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core0_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core0_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core0_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core0_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core1_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core1_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core1_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/interrupt_core1_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/io_mux_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/io_mux_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/io_mux_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/io_mux_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/iomux_mspi_pin_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/iomux_mspi_pin_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/iomux_mspi_pin_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/iomux_mspi_pin_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/isp_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/isp_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/isp_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/isp_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/jpeg_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/jpeg_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/jpeg_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/jpeg_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/keymng_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/keymng_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/keymng_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/keymng_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/l2mem_monitor_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/l2mem_monitor_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/l2mem_monitor_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/l2mem_monitor_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lcd_cam_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lcd_cam_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lcd_cam_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lcd_cam_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ledc_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ledc_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/ledc_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/ledc_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp_adc_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp_adc_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp_adc_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp_adc_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp_analog_peri_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp_analog_peri_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp_analog_peri_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp_analog_peri_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp_clkrst_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp_clkrst_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp_clkrst_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp_clkrst_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp_gpio_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp_gpio_reg.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp_gpio_struct.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp_gpio_struct.h
--- a/components/soc/esp32p4/register/hw_ver1/soc/lp_i2c_reg.h
+++ b/components/soc/esp32p4/register/hw_ver1/soc/lp_i2c_reg.h
--- a/Show More
+++ b/Show More