mirror of
https://github.com/espressif/esp-idf.git
synced 2026-08-04 14:19:57 +03:00
Merge branch 'fix/fix_mmu_dirom_reserve_search_logic_v6.0' into 'release/v6.0'
mmu: fixed drom/irom reservation bus cap search logic (v6.0) See merge request espressif/esp-idf!47389
This commit is contained in:
@@ -150,7 +150,7 @@ static void s_reserve_irom_region(mem_region_t *hw_mem_regions, int region_nums)
|
||||
cache_bus_mask_t bus_mask = s_get_bus_mask((uint32_t)&_instruction_reserved_start, irom_len_to_reserve);
|
||||
|
||||
for (int i = 0; i < SOC_MMU_LINEAR_ADDRESS_REGION_NUM; i++) {
|
||||
if (bus_mask & hw_mem_regions[i].bus_id) {
|
||||
if ((bus_mask & hw_mem_regions[i].bus_id) == bus_mask) {
|
||||
if (hw_mem_regions[i].region_size <= irom_len_to_reserve) {
|
||||
hw_mem_regions[i].free_head = hw_mem_regions[i].end;
|
||||
hw_mem_regions[i].max_slot_size = 0;
|
||||
@@ -178,7 +178,7 @@ static void s_reserve_drom_region(mem_region_t *hw_mem_regions, int region_nums)
|
||||
cache_bus_mask_t bus_mask = s_get_bus_mask((uint32_t)&_rodata_reserved_start, drom_len_to_reserve);
|
||||
|
||||
for (int i = 0; i < SOC_MMU_LINEAR_ADDRESS_REGION_NUM; i++) {
|
||||
if (bus_mask & hw_mem_regions[i].bus_id) {
|
||||
if ((bus_mask & hw_mem_regions[i].bus_id) == bus_mask) {
|
||||
if (hw_mem_regions[i].region_size <= drom_len_to_reserve) {
|
||||
hw_mem_regions[i].free_head = hw_mem_regions[i].end;
|
||||
hw_mem_regions[i].max_slot_size = 0;
|
||||
|
||||
Reference in New Issue
Block a user