diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt
index 0d2c467863a..c9b282cbe06 100644
--- a/components/soc/CMakeLists.txt
+++ b/components/soc/CMakeLists.txt
@@ -20,7 +20,11 @@ endif()
 
 # register headers that generated by script from CSV
 if(CONFIG_IDF_TARGET_ESP32P4)
-    list(APPEND includes "${target_folder}/register/hw_ver1")
+    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()
     if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${target_folder}/register")
         list(APPEND includes "${target_folder}/register")
diff --git a/tools/ci/astyle-rules.yml b/tools/ci/astyle-rules.yml
index 12da05ef74e..1e8b4ebd609 100644
--- a/tools/ci/astyle-rules.yml
+++ b/tools/ci/astyle-rules.yml
@@ -156,6 +156,7 @@ components_not_formatted_permanent:
     - "/components/rt/"
     # SoC header files (generated)
     - "/components/soc/*/include/soc/"
+    - "/components/soc/*/register/hw_ver*/soc/"
     # Example resource files (generated)
     - "/examples/peripherals/lcd/i80_controller/main/images/"
     - "/examples/peripherals/dac/dac_continuous/dac_audio/main/audio_example_file.h"