Move linker scripts to sub-folders

esp-rs · Feb 18, 2022 · 7b59c9e · 7b59c9e
1 parent 826d485
commit 7b59c9e
Show file tree

Hide file tree

Showing 33 changed files with 62 additions and 34 deletions.
diff --git a/esp-hal-common/src/interrupt/riscv.rs b/esp-hal-common/src/interrupt/riscv.rs
@@ -48,7 +48,8 @@ pub enum InterruptKind {
 }
 
 /// Enumeration of available CPU interrupts.
-/// It is possible to create a handler for each of the interrupts. (e.g. `interrupt3`)
+/// It is possible to create a handler for each of the interrupts. (e.g.
+/// `interrupt3`)
 pub enum CpuInterrupt {
     Interrupt1 = 1,
     Interrupt2,

diff --git a/esp-hal-procmacros/src/lib.rs b/esp-hal-procmacros/src/lib.rs
@@ -1,6 +1,5 @@
 use darling::FromMeta;
-use proc_macro::TokenStream;
-use proc_macro::{self, Span};
+use proc_macro::{self, Span, TokenStream};
 use proc_macro_error::{abort, proc_macro_error};
 use quote::quote;
 use syn::{parse_macro_input, AttributeArgs};

diff --git a/esp32-hal/.cargo/config.toml b/esp32-hal/.cargo/config.toml
@@ -1,10 +1,10 @@
 [target.xtensa-esp32-none-elf]
-runner = "xtensa-esp32-elf-gdb -q -x xtensa.gdb"
+runner = "espflash --monitor"
 
 [build]
 rustflags = [
   "-C", "link-arg=-nostartfiles",
-  "-C", "link-arg=-Wl,-Tlink.x",
+  "-C", "link-arg=-Wl,-Tlinkall.x",
 ]
 target = "xtensa-esp32-none-elf"
 

diff --git a/esp32-hal/build.rs b/esp32-hal/build.rs
@@ -5,20 +5,23 @@ fn main() {
     let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
     File::create(out.join("memory.x"))
         .unwrap()
-        .write_all(include_bytes!("memory.x"))
+        .write_all(include_bytes!("ld/memory.x"))
         .unwrap();
 
     File::create(out.join("alias.x"))
         .unwrap()
-        .write_all(include_bytes!("rom.x"))
+        .write_all(include_bytes!("ld/rom.x"))
         .unwrap();
 
     File::create(out.join("hal-defaults.x"))
         .unwrap()
-        .write_all(include_bytes!("hal-defaults.x"))
+        .write_all(include_bytes!("ld/hal-defaults.x"))
         .unwrap();
 
-    println!("cargo:rustc-link-arg=-Thal-defaults.x");
+    File::create(out.join("linkall.x"))
+        .unwrap()
+        .write_all(include_bytes!("ld/linkall.x"))
+        .unwrap();
 
     println!("cargo:rustc-link-search={}", out.display());
 

diff --git a/esp32-hal/hal-defaults.x → esp32-hal/ld/hal-defaults.x b/esp32-hal/hal-defaults.x → esp32-hal/ld/hal-defaults.x
diff --git a/esp32-hal/ld/linkall.x b/esp32-hal/ld/linkall.x
@@ -0,0 +1,2 @@
+INCLUDE "link.x"
+INCLUDE "hal-defaults.x"
diff --git a/esp32-hal/memory.x → esp32-hal/ld/memory.x b/esp32-hal/memory.x → esp32-hal/ld/memory.x
diff --git a/esp32-hal/rom.x → esp32-hal/ld/rom.x b/esp32-hal/rom.x → esp32-hal/ld/rom.x
diff --git a/esp32c3-hal/.cargo/config.toml b/esp32c3-hal/.cargo/config.toml
@@ -1,5 +1,7 @@
 [target.riscv32imc-unknown-none-elf]
+runner = "espflash --format direct-boot --monitor"
 rustflags = [
+  "-C", "link-arg=-Tlinkall.x"
 ]
 
 [build]

diff --git a/esp32c3-hal/build.rs b/esp32c3-hal/build.rs
@@ -14,25 +14,29 @@ fn main() {
 
     File::create(out.join("memory.x"))
         .unwrap()
-        .write_all(include_bytes!("db-esp32c3-memory.x"))
+        .write_all(include_bytes!("ld/db-esp32c3-memory.x"))
         .unwrap();
 
     File::create(out.join("esp32c3-link.x"))
         .unwrap()
-        .write_all(include_bytes!("db-esp32c3-link.x"))
+        .write_all(include_bytes!("ld/db-esp32c3-link.x"))
         .unwrap();
 
     File::create(out.join("riscv-link.x"))
         .unwrap()
-        .write_all(include_bytes!("db-riscv-link.x"))
+        .write_all(include_bytes!("ld/db-riscv-link.x"))
+        .unwrap();
+
+    File::create(out.join("linkall.x"))
+        .unwrap()
+        .write_all(include_bytes!("ld/db-linkall.x"))
         .unwrap();
 
     println!("cargo:rustc-link-search={}", out.display());
 
     // Only re-run the build script when memory.x is changed,
     // instead of when any part of the source code changes.
     println!("cargo:rerun-if-changed=memory.x");
-    println!("cargo:rustc-link-arg=-Tesp32c3-link.x");
 
     add_defaults();
     prepare_trap();
@@ -44,21 +48,24 @@ fn main() {
     let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
     File::create(out.join("memory.x"))
         .unwrap()
-        .write_all(include_bytes!("bl-esp32c3-memory.x"))
+        .write_all(include_bytes!("ld/bl-esp32c3-memory.x"))
         .unwrap();
 
     File::create(out.join("bl-riscv-link.x"))
         .unwrap()
-        .write_all(include_bytes!("bl-riscv-link.x"))
+        .write_all(include_bytes!("ld/bl-riscv-link.x"))
+        .unwrap();
+
+    File::create(out.join("linkall.x"))
+        .unwrap()
+        .write_all(include_bytes!("ld/bl-linkall.x"))
         .unwrap();
 
     println!("cargo:rustc-link-search={}", out.display());
 
     // Only re-run the build script when memory.x is changed,
     // instead of when any part of the source code changes.
     println!("cargo:rerun-if-changed=memory.x");
-    println!("cargo:rustc-link-arg=-Tmemory.x");
-    println!("cargo:rustc-link-arg=-Tbl-riscv-link.x");
 
     add_defaults();
     prepare_trap();
@@ -68,11 +75,10 @@ fn add_defaults() {
     let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
     File::create(out.join("hal-defaults.x"))
         .unwrap()
-        .write_all(include_bytes!("hal-defaults.x"))
+        .write_all(include_bytes!("ld/hal-defaults.x"))
         .unwrap();
 
     println!("cargo:rustc-link-search={}", out.display());
-    println!("cargo:rustc-link-arg=-Thal-defaults.x");
 }
 
 fn prepare_trap() {

diff --git a/esp32c3-hal/examples/hello_world.rs b/esp32c3-hal/examples/hello_world.rs
@@ -29,4 +29,4 @@ fn main() -> ! {
         writeln!(serial0, "Hello world!").unwrap();
         block!(timer0.wait()).unwrap();
     }
-}
+}
diff --git a/esp32c3-hal/bl-esp32c3-memory.x → esp32c3-hal/ld/bl-esp32c3-memory.x b/esp32c3-hal/bl-esp32c3-memory.x → esp32c3-hal/ld/bl-esp32c3-memory.x
diff --git a/esp32c3-hal/ld/bl-linkall.x b/esp32c3-hal/ld/bl-linkall.x
@@ -0,0 +1,3 @@
+INCLUDE "memory.x"
+INCLUDE "bl-riscv-link.x"
+INCLUDE "hal-defaults.x"
diff --git a/esp32c3-hal/bl-riscv-link.x → esp32c3-hal/ld/bl-riscv-link.x b/esp32c3-hal/bl-riscv-link.x → esp32c3-hal/ld/bl-riscv-link.x
diff --git a/esp32c3-hal/db-esp32c3-link.x → esp32c3-hal/ld/db-esp32c3-link.x b/esp32c3-hal/db-esp32c3-link.x → esp32c3-hal/ld/db-esp32c3-link.x
diff --git a/esp32c3-hal/db-esp32c3-memory.x → esp32c3-hal/ld/db-esp32c3-memory.x b/esp32c3-hal/db-esp32c3-memory.x → esp32c3-hal/ld/db-esp32c3-memory.x
diff --git a/esp32c3-hal/ld/db-linkall.x b/esp32c3-hal/ld/db-linkall.x
@@ -0,0 +1,2 @@
+INCLUDE "esp32c3-link.x"
+INCLUDE "hal-defaults.x"
diff --git a/esp32c3-hal/db-riscv-link.x → esp32c3-hal/ld/db-riscv-link.x b/esp32c3-hal/db-riscv-link.x → esp32c3-hal/ld/db-riscv-link.x
diff --git a/esp32c3-hal/hal-defaults.x → esp32c3-hal/ld/hal-defaults.x b/esp32c3-hal/hal-defaults.x → esp32c3-hal/ld/hal-defaults.x
diff --git a/esp32s2-hal/.cargo/config.toml b/esp32s2-hal/.cargo/config.toml
@@ -1,10 +1,10 @@
 [target.xtensa-esp32s2-none-elf]
-runner = "xtensa-esp32s2-elf-gdb -q -x xtensa.gdb"
+runner = "espflash --monitor"
 
 [build]
 rustflags = [
   "-C", "link-arg=-nostartfiles",
-  "-C", "link-arg=-Wl,-Tlink.x",
+  "-C", "link-arg=-Wl,-Tlinkall.x",
 ]
 target = "xtensa-esp32s2-none-elf"
 

diff --git a/esp32s2-hal/build.rs b/esp32s2-hal/build.rs
@@ -5,20 +5,23 @@ fn main() {
     let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
     File::create(out.join("memory.x"))
         .unwrap()
-        .write_all(include_bytes!("memory.x"))
+        .write_all(include_bytes!("ld/memory.x"))
         .unwrap();
 
     File::create(out.join("alias.x"))
         .unwrap()
-        .write_all(include_bytes!("rom.x"))
+        .write_all(include_bytes!("ld/rom.x"))
         .unwrap();
 
     File::create(out.join("hal-defaults.x"))
         .unwrap()
-        .write_all(include_bytes!("hal-defaults.x"))
+        .write_all(include_bytes!("ld/hal-defaults.x"))
         .unwrap();
 
-    println!("cargo:rustc-link-arg=-Thal-defaults.x");
+    File::create(out.join("linkall.x"))
+        .unwrap()
+        .write_all(include_bytes!("ld/linkall.x"))
+        .unwrap();
 
     println!("cargo:rustc-link-search={}", out.display());
 

diff --git a/esp32s2-hal/hal-defaults.x → esp32s2-hal/ld/hal-defaults.x b/esp32s2-hal/hal-defaults.x → esp32s2-hal/ld/hal-defaults.x
diff --git a/esp32s2-hal/ld/linkall.x b/esp32s2-hal/ld/linkall.x
@@ -0,0 +1,2 @@
+INCLUDE "link.x"
+INCLUDE "hal-defaults.x"
diff --git a/esp32s2-hal/memory.x → esp32s2-hal/ld/memory.x b/esp32s2-hal/memory.x → esp32s2-hal/ld/memory.x
diff --git a/esp32s2-hal/rom.x → esp32s2-hal/ld/rom.x b/esp32s2-hal/rom.x → esp32s2-hal/ld/rom.x
diff --git a/esp32s2-hal/src/lib.rs b/esp32s2-hal/src/lib.rs
@@ -1,7 +1,7 @@
 #![no_std]
 
 pub use embedded_hal as ehal;
-pub use esp_hal_common::{pac, prelude, Delay, Serial, Timer, ram};
+pub use esp_hal_common::{pac, prelude, ram, Delay, Serial, Timer};
 
 #[no_mangle]
 extern "C" fn DefaultHandler(_level: u32, _interrupt: pac::Interrupt) {}

diff --git a/esp32s3-hal/.cargo/config.toml b/esp32s3-hal/.cargo/config.toml
@@ -1,10 +1,10 @@
 [target.xtensa-esp32s3-none-elf]
-runner = "xtensa-esp32s3-elf-gdb -q -x xtensa.gdb"
+runner = "espflash --monitor"
 
 [build]
 rustflags = [
   "-C", "link-arg=-nostartfiles",
-  "-C", "link-arg=-Wl,-Tesp32s3.x",
+  "-C", "link-arg=-Wl,-Tlinkall.x",
 ]
 target = "xtensa-esp32s3-none-elf"
 

diff --git a/esp32s3-hal/build.rs b/esp32s3-hal/build.rs
@@ -5,25 +5,28 @@ fn main() {
     let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
     File::create(out.join("memory.x"))
         .unwrap()
-        .write_all(include_bytes!("memory.x"))
+        .write_all(include_bytes!("ld/memory.x"))
         .unwrap();
 
     File::create(out.join("alias.x"))
         .unwrap()
-        .write_all(include_bytes!("rom.x"))
+        .write_all(include_bytes!("ld/rom.x"))
         .unwrap();
 
     File::create(out.join("hal-defaults.x"))
         .unwrap()
-        .write_all(include_bytes!("hal-defaults.x"))
+        .write_all(include_bytes!("ld/hal-defaults.x"))
         .unwrap();
 
     File::create(out.join("esp32s3.x"))
         .unwrap()
-        .write_all(include_bytes!("esp32s3.x"))
+        .write_all(include_bytes!("ld/esp32s3.x"))
         .unwrap();
 
-    println!("cargo:rustc-link-arg=-Thal-defaults.x");
+    File::create(out.join("linkall.x"))
+        .unwrap()
+        .write_all(include_bytes!("ld/linkall.x"))
+        .unwrap();
 
     println!("cargo:rustc-link-search={}", out.display());
 

diff --git a/esp32s3-hal/esp32s3.x → esp32s3-hal/ld/esp32s3.x b/esp32s3-hal/esp32s3.x → esp32s3-hal/ld/esp32s3.x
diff --git a/esp32s3-hal/hal-defaults.x → esp32s3-hal/ld/hal-defaults.x b/esp32s3-hal/hal-defaults.x → esp32s3-hal/ld/hal-defaults.x
diff --git a/esp32s3-hal/ld/linkall.x b/esp32s3-hal/ld/linkall.x
@@ -0,0 +1,2 @@
+INCLUDE "esp32s3.x"
+INCLUDE "hal-defaults.x"
diff --git a/esp32s3-hal/memory.x → esp32s3-hal/ld/memory.x b/esp32s3-hal/memory.x → esp32s3-hal/ld/memory.x
diff --git a/esp32s3-hal/rom.x → esp32s3-hal/ld/rom.x b/esp32s3-hal/rom.x → esp32s3-hal/ld/rom.x