blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 09:39:10 -04:00
Code Issues Projects Releases Wiki Activity

change(mmu): removed not-used SOC_MMU_PAGE_SIZE_CONFIGURABLE macro which is 0 on p4

Browse Source
This commit is contained in:
Armando 2024-07-26 15:00:44 +08:00 committed by Armando (Dou Yiwen)
parent d839ea6805
commit 133a217315
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/hal/esp32c5/include/hal/mmu_ll.h
View File

@ -79,11 +79,7 @@ __attribute__((always_inline))
static inline mmu_page_size_t mmu_ll_get_page_size(uint32_t mmu_id) static inline mmu_page_size_t mmu_ll_get_page_size(uint32_t mmu_id)
{ {
(void)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 MMU_PAGE_64KB;
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;
} }
/** /**
@ -94,11 +90,7 @@ static inline mmu_page_size_t mmu_ll_get_page_size(uint32_t mmu_id)
__attribute__((always_inline)) __attribute__((always_inline))
static inline void mmu_ll_set_page_size(uint32_t mmu_id, uint32_t size) static inline void mmu_ll_set_page_size(uint32_t mmu_id, uint32_t size)
{ {
uint8_t reg_val = (size == MMU_PAGE_64KB) ? 0 : HAL_ASSERT(size == MMU_PAGE_64KB);
(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);
} }
/** /**

4
components/soc/esp32p4/include/soc/Kconfig.soc_caps.in
View File

@ -883,10 +883,6 @@ config SOC_LEDC_FADE_PARAMS_BIT_WIDTH
int int
default 10 default 10
config SOC_MMU_PAGE_SIZE_CONFIGURABLE
bool
default n
config SOC_MMU_PERIPH_NUM config SOC_MMU_PERIPH_NUM
int int
default 2 default 2

1
components/soc/esp32p4/include/soc/soc_caps.h
View File

@ -346,7 +346,6 @@
#define SOC_LEDC_FADE_PARAMS_BIT_WIDTH (10) #define SOC_LEDC_FADE_PARAMS_BIT_WIDTH (10)
/*-------------------------- MMU CAPS ----------------------------------------*/ /*-------------------------- MMU CAPS ----------------------------------------*/
#define SOC_MMU_PAGE_SIZE_CONFIGURABLE (0)
#define SOC_MMU_PERIPH_NUM (2U) #define SOC_MMU_PERIPH_NUM (2U)
#define SOC_MMU_LINEAR_ADDRESS_REGION_NUM (2U) #define SOC_MMU_LINEAR_ADDRESS_REGION_NUM (2U)
#define SOC_MMU_DI_VADDR_SHARED (1) /*!< D/I vaddr are shared */ #define SOC_MMU_DI_VADDR_SHARED (1) /*!< D/I vaddr are shared */