Skip to content

Commit 32c6ee8

Browse files
committed
change(heap): Remove todo of closed ticket in memory_layout.c files
Leftover closed ticket removed from memory_layout.c on the following targets: - esp32c5 - esp32c6 - esp32h2
1 parent 2ac0fc1 commit 32c6ee8

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

components/heap/port/esp32c5/memory_layout.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ SOC_RESERVE_MEMORY_REGION((intptr_t)&_data_start, (intptr_t)&_heap_start, dram_d
102102
SOC_RESERVE_MEMORY_REGION((intptr_t)&_iram_start, (intptr_t)&_iram_end, iram_code);
103103

104104
#ifdef CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP
105-
// TODO: IDF-6019 check reserved lp mem region
106105
SOC_RESERVE_MEMORY_REGION(SOC_RTC_DRAM_LOW, (intptr_t)&_rtc_force_slow_end, rtcram_data);
107106
#endif
108107

components/heap/port/esp32c6/memory_layout.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -42,11 +42,11 @@ enum {
4242
/**
4343
* Defined the attributes and allocation priority of each memory on the chip,
4444
* The heap allocator will traverse all types of memory types in column High Priority Matching and match the specified caps at first,
45-
* if no memory caps matched or the allocation is failed, it will go to columns Medium Priorty Matching and Low Priority Matching
45+
* if no memory caps matched or the allocation is failed, it will go to columns Medium Priority Matching and Low Priority Matching
4646
* in turn to continue matching.
4747
*/
4848
const soc_memory_type_desc_t soc_memory_types[SOC_MEMORY_TYPE_NUM] = {
49-
/* Mem Type Name High Priority Matching Medium Priorty Matching Low Priority Matching */
49+
/* Mem Type Name High Priority Matching Medium Priority Matching Low Priority Matching */
5050
[SOC_MEMORY_TYPE_RAM] = { "RAM", { ESP32C6_MEM_COMMON_CAPS | MALLOC_CAP_DMA, 0, 0 }},
5151
[SOC_MEMORY_TYPE_RTCRAM] = { "RTCRAM", { MALLOC_CAP_RTCRAM, ESP32C6_MEM_COMMON_CAPS, 0 }},
5252
};
@@ -96,7 +96,6 @@ SOC_RESERVE_MEMORY_REGION((intptr_t)&_data_start, (intptr_t)&_heap_start, dram_d
9696
SOC_RESERVE_MEMORY_REGION((intptr_t)&_iram_start, (intptr_t)&_iram_end, iram_code);
9797

9898
#ifdef CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP
99-
// TODO: IDF-6019 check reserved lp mem region
10099
SOC_RESERVE_MEMORY_REGION(SOC_RTC_DRAM_LOW, (intptr_t)&_rtc_force_slow_end, rtcram_data);
101100
#endif
102101

components/heap/port/esp32h2/memory_layout.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -40,11 +40,11 @@ enum {
4040
/**
4141
* Defined the attributes and allocation priority of each memory on the chip,
4242
* The heap allocator will traverse all types of memory types in column High Priority Matching and match the specified caps at first,
43-
* if no memory caps matched or the allocation is failed, it will go to columns Medium Priorty Matching and Low Priority Matching
43+
* if no memory caps matched or the allocation is failed, it will go to columns Medium Priority Matching and Low Priority Matching
4444
* in turn to continue matching.
4545
*/
4646
const soc_memory_type_desc_t soc_memory_types[SOC_MEMORY_TYPE_NUM] = {
47-
/* Mem Type Name High Priority Matching Medium Priorty Matching Low Priority Matching */
47+
/* Mem Type Name High Priority Matching Medium Priority Matching Low Priority Matching */
4848
[SOC_MEMORY_TYPE_RAM] = { "RAM", { ESP32H2_MEM_COMMON_CAPS | MALLOC_CAP_DMA, 0, 0 }},
4949
[SOC_MEMORY_TYPE_RTCRAM] = { "RTCRAM", { MALLOC_CAP_RTCRAM, ESP32H2_MEM_COMMON_CAPS, 0 }},
5050
};
@@ -95,7 +95,6 @@ SOC_RESERVE_MEMORY_REGION((intptr_t)&_data_start, (intptr_t)&_heap_start, dram_d
9595
SOC_RESERVE_MEMORY_REGION((intptr_t)&_iram_start, (intptr_t)&_iram_end, iram_code);
9696

9797
#ifdef CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP
98-
// TODO: IDF-6019 check reserved lp mem region
9998
SOC_RESERVE_MEMORY_REGION(SOC_RTC_DRAM_LOW, (intptr_t)&_rtc_force_slow_end, rtcram_data);
10099
#endif
101100

0 commit comments

Comments
 (0)