Merge branch 'feature/enable_zb_for_esp32p4_v6.0' into 'release/v6.0'

feat(soc): enable zb* extensions for esp32p4 greater v3 (v6.0)

See merge request espressif/esp-idf!50779
This commit is contained in:
Jiang Jiang Jian
2026-07-20 10:44:17 +08:00
+2 -5
View File
@@ -14,7 +14,8 @@ if(CONFIG_IDF_TOOLCHAIN_GCC)
CONFIG_IDF_TARGET_ESP32H2 OR
CONFIG_IDF_TARGET_ESP32H21)
set(_march "rv32imac_zicsr_zifencei_zaamo_zalrsc")
elseif(CONFIG_IDF_TARGET_ESP32H4)
elseif(CONFIG_IDF_TARGET_ESP32H4 OR
(CONFIG_IDF_TARGET_ESP32P4 AND NOT CONFIG_ESP32P4_SELECTS_REV_LESS_V3))
set(_march "rv32imafcb_zicsr_zifencei_zaamo_zalrsc")
elseif(CONFIG_IDF_TARGET_ESP32P4)
set(_march "rv32imafc_zicsr_zifencei_zaamo_zalrsc")
@@ -38,10 +39,6 @@ if(CONFIG_IDF_TOOLCHAIN_GCC)
"-mno-cm-push-reverse"
"-mno-cm-popret")
if(CONFIG_SOC_CPU_HAS_ZB_EXTENSIONS)
set(_march "${_march}_zba_zbb_zbs")
endif()
if((CONFIG_SOC_CPU_HAS_ZC_EXTENSIONS AND NOT CONFIG_SOC_CPU_ZCMP_WORKAROUND) OR
CONFIG_COMPILER_ENABLE_RISCV_ZCMP)
if(NOT CONFIG_ESP32P4_SELECTS_REV_LESS_V3)