Merge branch 'fix/mmu_func_force_inline_v5.3' into 'release/v5.3'

suda-morris · suda-morris · commit 0c03c2008ee7 · 2024-08-05T17:14:39.000+08:00
fix(mmu_map): make a static function force inline in order not be put in flash(backport v5.3)

See merge request espressif/esp-idf!32574
diff --git a/components/esp_mm/esp_mmu_map.c b/components/esp_mm/esp_mmu_map.c
@@ -186,7 +186,7 @@ static void s_reserve_drom_region(mem_region_t *hw_mem_regions, int region_nums)
 #endif  //#if CONFIG_APP_BUILD_USE_FLASH_SECTIONS
 
 #if SOC_MMU_PER_EXT_MEM_TARGET
-static inline uint32_t s_get_mmu_id_from_target(mmu_target_t target)
+FORCE_INLINE_ATTR uint32_t s_get_mmu_id_from_target(mmu_target_t target)
 {
     return (target == MMU_TARGET_FLASH0) ? MMU_LL_FLASH_MMU_ID : MMU_LL_PSRAM_MMU_ID;
 }

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ static void s_reserve_drom_region(mem_region_t *hw_mem_regions, int region_nums)`
`186`	`186`	`#endif //#if CONFIG_APP_BUILD_USE_FLASH_SECTIONS`
`187`	`187`
`188`	`188`	`#if SOC_MMU_PER_EXT_MEM_TARGET`
`189`		`-static inline uint32_t s_get_mmu_id_from_target(mmu_target_t target)`
	`189`	`+FORCE_INLINE_ATTR uint32_t s_get_mmu_id_from_target(mmu_target_t target)`
`190`	`190`	`{`
`191`	`191`	`return (target == MMU_TARGET_FLASH0) ? MMU_LL_FLASH_MMU_ID : MMU_LL_PSRAM_MMU_ID;`
`192`	`192`	`}`