From 9fb2b5fa86e0a1b79a3c24a4b415e1c0dbed52cf Mon Sep 17 00:00:00 2001 From: Greg V Date: Fri, 14 Jan 2022 22:55:39 +0300 Subject: [PATCH] examples/stm32l1: remove memory.x, use the crate-provided one --- examples/stm32l1/build.rs | 30 ------------------------------ examples/stm32l1/memory.x | 5 ----- 2 files changed, 35 deletions(-) delete mode 100644 examples/stm32l1/memory.x diff --git a/examples/stm32l1/build.rs b/examples/stm32l1/build.rs index 30691aa9..8cd32d7e 100644 --- a/examples/stm32l1/build.rs +++ b/examples/stm32l1/build.rs @@ -1,34 +1,4 @@ -//! This build script copies the `memory.x` file from the crate root into -//! a directory where the linker can always find it at build time. -//! For many projects this is optional, as the linker always searches the -//! project root directory -- wherever `Cargo.toml` is. However, if you -//! are using a workspace or have a more complicated build setup, this -//! build script becomes required. Additionally, by requesting that -//! Cargo re-run the build script whenever `memory.x` is changed, -//! updating `memory.x` ensures a rebuild of the application with the -//! new memory settings. - -use std::env; -use std::fs::File; -use std::io::Write; -use std::path::PathBuf; - fn main() { - // Put `memory.x` in our output directory and ensure it's - // on the linker search path. - let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap()); - File::create(out.join("memory.x")) - .unwrap() - .write_all(include_bytes!("memory.x")) - .unwrap(); - println!("cargo:rustc-link-search={}", out.display()); - - // By default, Cargo will re-run a build script whenever - // any file in the project changes. By specifying `memory.x` - // here, we ensure the build script is only re-run when - // `memory.x` is changed. - println!("cargo:rerun-if-changed=memory.x"); - println!("cargo:rustc-link-arg-bins=--nmagic"); println!("cargo:rustc-link-arg-bins=-Tlink.x"); println!("cargo:rustc-link-arg-bins=-Tdefmt.x"); diff --git a/examples/stm32l1/memory.x b/examples/stm32l1/memory.x deleted file mode 100644 index c94d395c..00000000 --- a/examples/stm32l1/memory.x +++ /dev/null @@ -1,5 +0,0 @@ -MEMORY -{ - FLASH : ORIGIN = 0x08000000, LENGTH = 128K - RAM : ORIGIN = 0x20000000, LENGTH = 32K -}