Fix linker script after a bad rebase

jessebraham · Feb 22, 2023 · 8168893 · 8168893
1 parent 952e270
commit 8168893
Showing 1 changed file with 5 additions and 38 deletions.
diff --git a/esp32c6-hal/ld/db-riscv-link.x b/esp32c6-hal/ld/db-riscv-link.x
@@ -79,7 +79,7 @@ SECTIONS
     _erodata = .;
   } > REGION_RODATA
 
-  _rodata_size = _erodata - _srodata;
+  _rodata_size = _erodata - _srodata + 8;
   .data ORIGIN(RAM) : AT(_text_size + _rodata_size)
   {
     _sdata = .;
@@ -91,22 +91,22 @@ SECTIONS
     _edata = .;
   } > REGION_DATA
 
-  _data_size = _edata - _sdata;
+  _data_size = _edata - _sdata + 8;
   .rwtext ORIGIN(REGION_RWTEXT) + _data_size : AT(_text_size + _rodata_size + _data_size){
     _srwtext = .;
     *(.rwtext);
     . = ALIGN(4);
     _erwtext = .;
   } > REGION_RWTEXT
-  _rwtext_size = _erwtext - _srwtext;
+  _rwtext_size = _erwtext - _srwtext + 8;
 
   .rtc_fast.text : AT(_text_size + _rodata_size + _data_size + _rwtext_size) {
     _srtc_fast_text = .;
     *(.rtc_fast.literal .rtc_fast.text .rtc_fast.literal.* .rtc_fast.text.*)
     . = ALIGN(4);
     _ertc_fast_text = .;
   } > REGION_RTC_FAST
-  _fast_text_size = _ertc_fast_text - _srtc_fast_text;
+  _fast_text_size = _ertc_fast_text - _srtc_fast_text + 8;
 
   .rtc_fast.data : AT(_text_size + _rodata_size + _data_size + _rwtext_size + _fast_text_size)
   {
@@ -115,7 +115,7 @@ SECTIONS
     . = ALIGN(4);
     _rtc_fast_data_end = ABSOLUTE(.);
   } > REGION_RTC_FAST
-  _rtc_fast_data_size = _rtc_fast_data_end - _rtc_fast_data_start;
+  _rtc_fast_data_size = _rtc_fast_data_end - _rtc_fast_data_start + 8;
 
   .rtc_fast.bss (NOLOAD) : ALIGN(4)
   {
@@ -157,39 +157,6 @@ SECTIONS
     _eheap = .;
   } > REGION_HEAP
 
-<<<<<<< feature/esp32c6
-=======
-  .rtc_fast.text : AT(_text_size + _rodata_size + _data_size + _rwtext_size) {
-    _srtc_fast_text = .;
-    *(.rtc_fast.literal .rtc_fast.text .rtc_fast.literal.* .rtc_fast.text.*)
-    . = ALIGN(4);
-    _ertc_fast_text = .;
-  } > REGION_RTC_FAST
-  _fast_text_size = _ertc_fast_text - _srtc_fast_text + 8;
-
-  .rtc_fast.data : AT(_text_size + _rodata_size + _data_size + _rwtext_size + _fast_text_size)
-  {
-    _rtc_fast_data_start = ABSOLUTE(.);
-    *(.rtc_fast.data .rtc_fast.data.*)
-    . = ALIGN(4);
-    _rtc_fast_data_end = ABSOLUTE(.);
-  } > REGION_RTC_FAST
-  _rtc_fast_data_size = _rtc_fast_data_end - _rtc_fast_data_start + 8;
-
- .rtc_fast.bss (NOLOAD) : ALIGN(4)
-  {
-    _rtc_fast_bss_start = ABSOLUTE(.);
-    *(.rtc_fast.bss .rtc_fast.bss.*)
-    . = ALIGN(4);
-    _rtc_fast_bss_end = ABSOLUTE(.);
-  } > REGION_RTC_FAST
-
- .rtc_fast.noinit (NOLOAD) : ALIGN(4)
-  {
-    *(.rtc_fast.noinit .rtc_fast.noinit.*)
-  } > REGION_RTC_FAST
-
->>>>>>> RAM example works in direct-boot mode
   /* fictitious region that represents the memory available for the stack */
   .stack (NOLOAD) :
   {