Put the implicit memory.x behind a `memory_x` feature on embassy-stm32.

2 files changed, 7 insertions, 1 deletions

diff --git a/stm32-metapac-gen/src/assets/build.rs b/stm32-metapac-gen/src/assets/build.rs
index 13050315..0fe7c65e 100644
--- a/stm32-metapac-gen/src/assets/build.rs
+++ b/stm32-metapac-gen/src/assets/build.rs
@@ -17,6 +17,11 @@ fn main() {
         //.write_all(include_bytes!("memory.x"))
         //.unwrap();
 
+    println!("HOWDY");
+
+    #[cfg(feature = "memory_x")]
+    println!("cargo:rustc-link-search=src/chips/{}/memory_x/", _chip_name);
+
     #[cfg(feature = "rt")]
     println!("cargo:rustc-link-search=src/chips/{}", _chip_name);
 
diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs
index e63c35ec..5e0cc58d 100644
--- a/stm32-metapac-gen/src/lib.rs
+++ b/stm32-metapac-gen/src/lib.rs
@@ -773,7 +773,8 @@ fn gen_memory_x(out_dir: &PathBuf, chip: &Chip) {
     write!(memory_x, "    RAM : ORIGIN = 0x{:x}, LENGTH = {}\n", ram_origin, ram_bytes).unwrap();
     write!(memory_x, "}}").unwrap();
 
-    let mut file = File::create(out_dir.join("memory.x")).unwrap();
+    fs::create_dir_all(out_dir.join("memory_x")).unwrap();
+    let mut file = File::create(out_dir.join("memory_x").join("memory.x")).unwrap();
     file.write_all( memory_x.as_bytes() ).unwrap();
 
 }