diff --git a/esp32c6-hal/ld/db-esp32c6-link.x b/esp32c6-hal/ld/db-esp32c6-link.x index 63ba963a232..b2e740b39dc 100644 --- a/esp32c6-hal/ld/db-esp32c6-link.x +++ b/esp32c6-hal/ld/db-esp32c6-link.x @@ -6,9 +6,9 @@ SECTIONS { LONG(0xaedb041d) LONG(0xaedb041d) - } > IROM + } > ROM } -_stext = ORIGIN(IROM) + 8; +_stext = ORIGIN(ROM) + 8; INCLUDE riscv-link.x diff --git a/esp32c6-hal/ld/db-esp32c6-memory.x b/esp32c6-hal/ld/db-esp32c6-memory.x index 68a8d68e65e..b4cbf63cc93 100644 --- a/esp32c6-hal/ld/db-esp32c6-memory.x +++ b/esp32c6-hal/ld/db-esp32c6-memory.x @@ -16,28 +16,23 @@ MEMORY /* 512K of on soc RAM, 32K reserved for cache */ ICACHE : ORIGIN = 0x40800000, LENGTH = 32K - /* Instruction RAM */ - IRAM : ORIGIN = 0x40800000 + 32K, LENGTH = 512K - 32K - /* Data RAM */ - DRAM : ORIGIN = 0x40800000 + 32K, LENGTH = 512K - 32K + + RAM : ORIGIN = 0x40800000 + 32K, LENGTH = 512K - 32K /* External flash */ - /* Instruction ROM */ - IROM : ORIGIN = 0x42000000, LENGTH = 0x400000 - /* Data ROM */ - DROM : ORIGIN = 0x42800000, LENGTH = 0x400000 + ROM : ORIGIN = 0x42000000, LENGTH = 0x400000 /* RTC fast memory (executable). Persists over deep sleep. */ RTC_FAST : ORIGIN = 0x50000000, LENGTH = 16K /*- ESP_BOOTLOADER_RESERVE_RTC*/ } -REGION_ALIAS("REGION_TEXT", IROM); -REGION_ALIAS("REGION_RODATA", DROM); +REGION_ALIAS("REGION_TEXT", ROM); +REGION_ALIAS("REGION_RODATA", ROM); -REGION_ALIAS("REGION_DATA", DRAM); -REGION_ALIAS("REGION_BSS", DRAM); -REGION_ALIAS("REGION_HEAP", DRAM); -REGION_ALIAS("REGION_STACK", DRAM); +REGION_ALIAS("REGION_DATA", RAM); +REGION_ALIAS("REGION_BSS", RAM); +REGION_ALIAS("REGION_HEAP", RAM); +REGION_ALIAS("REGION_STACK", RAM); -REGION_ALIAS("REGION_RWTEXT", IRAM); +REGION_ALIAS("REGION_RWTEXT", RAM); REGION_ALIAS("REGION_RTC_FAST", RTC_FAST); diff --git a/esp32c6-hal/ld/db-riscv-link.x b/esp32c6-hal/ld/db-riscv-link.x index b75f8dadd7c..98b473a5041 100644 --- a/esp32c6-hal/ld/db-riscv-link.x +++ b/esp32c6-hal/ld/db-riscv-link.x @@ -61,7 +61,7 @@ SECTIONS } > REGION_TEXT _text_size = _etext - _stext + 8; - .rodata ORIGIN(DROM) + _text_size : AT(_text_size) + .rodata ORIGIN(ROM) + _text_size : AT(_text_size) { _srodata = .; *(.srodata .srodata.*); @@ -75,7 +75,7 @@ SECTIONS } > REGION_RODATA _rodata_size = _erodata - _srodata + 8; - .data ORIGIN(DRAM) : AT(_text_size + _rodata_size) + .data ORIGIN(RAM) : AT(_text_size + _rodata_size) { _sdata = .; /* Must be called __global_pointer$ for linker relaxations to work. */ @@ -182,9 +182,9 @@ SECTIONS } PROVIDE(_sidata = _erodata + 8); -PROVIDE(_irwtext = ORIGIN(DROM) + _text_size + _rodata_size + _data_size); -PROVIDE(_irtc_fast_text = ORIGIN(DROM) + _text_size + _rodata_size + _data_size + _rwtext_size); -PROVIDE(_irtc_fast_data = ORIGIN(DROM) + _text_size + _rodata_size + _data_size + _rwtext_size + _fast_text_size); +PROVIDE(_irwtext = ORIGIN(ROM) + _text_size + _rodata_size + _data_size); +PROVIDE(_irtc_fast_text = ORIGIN(ROM) + _text_size + _rodata_size + _data_size + _rwtext_size); +PROVIDE(_irtc_fast_data = ORIGIN(ROM) + _text_size + _rodata_size + _data_size + _rwtext_size + _fast_text_size); /* Do not exceed this mark in the error messages above | */ ASSERT(ORIGIN(REGION_TEXT) % 4 == 0, "