diff --git a/components/hal/esp32c5/include/hal/mmu_ll.h b/components/hal/esp32c5/include/hal/mmu_ll.h index 610c45b7cb..398d2bd7a1 100644 --- a/components/hal/esp32c5/include/hal/mmu_ll.h +++ b/components/hal/esp32c5/include/hal/mmu_ll.h @@ -79,11 +79,7 @@ __attribute__((always_inline)) static inline mmu_page_size_t mmu_ll_get_page_size(uint32_t mmu_id) { (void)mmu_id; - uint32_t page_size_code = REG_GET_FIELD(SPI_MEM_MMU_POWER_CTRL_REG(0), SPI_MMU_PAGE_SIZE); - return (page_size_code == 0) ? MMU_PAGE_64KB : - (page_size_code == 1) ? MMU_PAGE_32KB : - (page_size_code == 2) ? MMU_PAGE_16KB : - MMU_PAGE_8KB; + return MMU_PAGE_64KB; } /** @@ -94,11 +90,7 @@ static inline mmu_page_size_t mmu_ll_get_page_size(uint32_t mmu_id) __attribute__((always_inline)) static inline void mmu_ll_set_page_size(uint32_t mmu_id, uint32_t size) { - uint8_t reg_val = (size == MMU_PAGE_64KB) ? 0 : - (size == MMU_PAGE_32KB) ? 1 : - (size == MMU_PAGE_16KB) ? 2 : - (size == MMU_PAGE_8KB) ? 3 : 0; - REG_SET_FIELD(SPI_MEM_MMU_POWER_CTRL_REG(0), SPI_MMU_PAGE_SIZE, reg_val); + HAL_ASSERT(size == MMU_PAGE_64KB); } /** diff --git a/components/soc/esp32p4/include/soc/Kconfig.soc_caps.in b/components/soc/esp32p4/include/soc/Kconfig.soc_caps.in index 407dabbe59..813ba34378 100644 --- a/components/soc/esp32p4/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32p4/include/soc/Kconfig.soc_caps.in @@ -883,10 +883,6 @@ config SOC_LEDC_FADE_PARAMS_BIT_WIDTH int default 10 -config SOC_MMU_PAGE_SIZE_CONFIGURABLE - bool - default n - config SOC_MMU_PERIPH_NUM int default 2 diff --git a/components/soc/esp32p4/include/soc/soc_caps.h b/components/soc/esp32p4/include/soc/soc_caps.h index 3f9dfd3bd8..55af4b7118 100644 --- a/components/soc/esp32p4/include/soc/soc_caps.h +++ b/components/soc/esp32p4/include/soc/soc_caps.h @@ -346,7 +346,6 @@ #define SOC_LEDC_FADE_PARAMS_BIT_WIDTH (10) /*-------------------------- MMU CAPS ----------------------------------------*/ -#define SOC_MMU_PAGE_SIZE_CONFIGURABLE (0) #define SOC_MMU_PERIPH_NUM (2U) #define SOC_MMU_LINEAR_ADDRESS_REGION_NUM (2U) #define SOC_MMU_DI_VADDR_SHARED (1) /*!< D/I vaddr are shared */