Skip to content

Commit 27c86b6

Browse files
committed
Work around git conflict
1 parent 45d769e commit 27c86b6

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

port/espressif/esp/ld/esp32_c3/esp32_c3_direct_boot.ld.base

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/*
2+
* This file was auto-generated by microzig
3+
*
24
* Target CPU: generic_rv32
35
* Target Chip: ESP32-C3
46
*/
@@ -37,13 +39,6 @@ SECTIONS
3739
microzig_bss_end = .;
3840
} > ram0
3941

40-
.heap (NOLOAD) :
41-
{
42-
microzig_heap_start = .;
43-
. = ORIGIN(ram0) + LENGTH(ram0);
44-
microzig_heap_end = .;
45-
} > ram0
46-
4742
.flash_end :
4843
{
4944
PROVIDE(microzig_flash_end = .);

0 commit comments

Comments
 (0)