From 687f44d8baee045070e9b6fe9bd6088acbb5b009 Mon Sep 17 00:00:00 2001 From: Guangzong Chen Date: Tue, 2 Apr 2024 21:30:15 -0400 Subject: [PATCH] update memory and buildr.rs --- Cargo.toml | 2 +- build.rs | 8 ++++---- memory.x | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a597c16..accbd80 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ cortex-m = { version = "0.7.7", features = [ ]} u5-lib = { git = "ssh://gitea@git.ggeta.com:2002/guangzong/u5_new.git",features = [ "stm32u5a5qj", -# "memory-x", +# "memory-x", # "stm32u575zi" ], default-features = false, branch = "dev" } eb_cmds = { git = "ssh://gitea@git.ggeta.com:2002/guangzong/eb_cmds.git"} diff --git a/build.rs b/build.rs index 047f5cb..e7706f6 100644 --- a/build.rs +++ b/build.rs @@ -1,8 +1,8 @@ fn main() { - println!("cargo:rustc-link-arg-bins=-Tmemory.x"); - // println!("cargo:rustc-link-arg-bins=--nmagic"); - // println!("cargo:rustc-link-arg-bins=-Tlink.x"); - // println!("cargo:rustc-link-arg-bins=-Tdefmt.x"); + // println!("cargo:rustc-link-arg-bins=-Tmemory.x"); + println!("cargo:rustc-link-arg-bins=--nmagic"); + println!("cargo:rustc-link-arg-bins=-Tlink.x"); + println!("cargo:rustc-link-arg-bins=-Tdefmt.x"); // enable cfg sdmmc // println!("cargo:rustc-cfg=sdmmc"); // for (key, _value) in std::env::vars() { diff --git a/memory.x b/memory.x index e30b286..d657598 100644 --- a/memory.x +++ b/memory.x @@ -1,6 +1,6 @@ MEMORY { - FLASH : ORIGIN = 0x08000000, LENGTH = 4096K /* BANK_1 */ - RAM : ORIGIN = 0x20000000, LENGTH = 2514K + FLASH : ORIGIN = 0x08000000, LENGTH = 4096K + RAM : ORIGIN = 0x20000000, LENGTH = 2496K /* 2514K? */ OTP : ORIGIN = 0x0bfa0000, LENGTH = 512 } \ No newline at end of file