esp32c3-hal: Restore MCUboot build after moving to esp-riscv-rt

Signed-off-by: Gustavo Henrique Nihei <[email protected]>
esp-rs · Mar 1, 2023 · b6318b3 · b6318b3
1 parent ca26086
commit b6318b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/esp32c3-hal/ld/mb-riscv-link.x b/esp32c3-hal/ld/mb-riscv-link.x
@@ -46,12 +46,11 @@ SECTIONS
   .rodata :
   {
     _srodata = .;
+    *(.srodata .srodata.*);
     *(EXCLUDE_FILE (*libriscv-*.rlib:riscv.*) .rodata);
     *(EXCLUDE_FILE (*libriscv-*.rlib:riscv.*) .rodata.*);
-    *(EXCLUDE_FILE (*libriscv_rt-*.rlib:riscv-rt.*) .rodata);
-    *(EXCLUDE_FILE (*libriscv_rt-*.rlib:riscv-rt.*) .rodata.*);
-    *(.srodata .srodata.*);
-    *(.rodata .rodata.*);
+    *(EXCLUDE_FILE (*libesp_riscv_rt-*.rlib:esp-riscv-rt.*) .rodata);
+    *(EXCLUDE_FILE (*libesp_riscv_rt-*.rlib:esp-riscv-rt.*) .rodata.*);
 
     /* 4-byte align the end (VMA) of this section.
        This is required by LLD to ensure the LMA of the following .data
@@ -67,12 +66,13 @@ SECTIONS
     /* point of the program. */
     KEEP(*(.init));
     KEEP(*(.init.rust));
+    KEEP(*(.text.abort));
     . = ALIGN(4);
     KEEP(*(.trap));
     KEEP(*(.trap.rust));
 
     *libriscv-*.rlib:riscv.*(.literal .text .literal.* .text.*);
-    *libriscv_rt-*.rlib:riscv-rt.*(.literal .text .literal.* .text.*);
+    *libesp_riscv_rt-*.rlib:esp-riscv-rt.*(.literal .text .literal.* .text.*);
     *(.rwtext);
     . = ALIGN(4);
     _erwtext = .;
@@ -129,7 +129,7 @@ SECTIONS
     *(.sdata .sdata.* .sdata2 .sdata2.*);
     *(.data .data.*);
     *libriscv-*.rlib:riscv.*(.rodata .rodata.*);
-    *libriscv_rt-*.rlib:riscv-rt.*(.rodata .rodata.*);
+    *libesp_riscv_rt-*.rlib:esp-riscv-rt.*(.rodata .rodata.*);
     . = ALIGN(4);
     _edata = .;
   } > REGION_DATA AT>ROM
@@ -188,9 +188,8 @@ SECTIONS
     _stext = .;
     *(EXCLUDE_FILE (*libriscv-*.rlib:riscv.*) .text)
     *(EXCLUDE_FILE (*libriscv-*.rlib:riscv.*) .text.*)
-    *(EXCLUDE_FILE (*libriscv_rt-*.rlib:riscv-rt.*) .text)
-    *(EXCLUDE_FILE (*libriscv_rt-*.rlib:riscv-rt.*) .text.*)
-    *(.text .text.*);
+    *(EXCLUDE_FILE (*libesp_riscv_rt-*.rlib:esp-riscv-rt.*) .text)
+    *(EXCLUDE_FILE (*libesp_riscv_rt-*.rlib:esp-riscv-rt.*) .text.*)
     _etext = .;
   } > REGION_TEXT AT>ROM
 

diff --git a/esp32c3-hal/src/lib.rs b/esp32c3-hal/src/lib.rs
@@ -54,6 +54,9 @@ pub mod analog {
 extern "C" {
     cfg_if::cfg_if! {
         if #[cfg(feature = "mcu-boot")] {
+            // Required for retrieving the entry point address
+            fn _start();
+
             // Functions from internal ROM
             fn cache_suspend_icache() -> u32;
             fn cache_resume_icache(val: u32);
@@ -124,7 +127,7 @@ extern "C" {
 #[no_mangle]
 #[used]
 // Entry point address for the MCUboot image header
-static ENTRY_POINT: unsafe fn() -> ! = start_hal;
+static ENTRY_POINT: unsafe extern "C" fn() = _start;
 
 #[cfg(feature = "direct-boot")]
 #[doc(hidden)]