fix: demo build

hpmicro · Nov 24, 2024 · f8d6db3 · f8d6db3
1 parent 040e83f
commit f8d6db3
Show file tree

Hide file tree

Showing 33 changed files with 294 additions and 979 deletions.
diff --git a/examples/hpm6200evk/.cargo/config.toml b/examples/hpm6200evk/.cargo/config.toml
@@ -13,7 +13,7 @@ rustflags = [
     "-C",
     "link-arg=-Tdevice.x", # __VECTORED_INTERRUPTS
     "-C",
-    "link-arg=-Tlink-fixed.x",
+    "link-arg=-Tlink.x",
     "-C",
     "link-arg=-Tdefmt.x",
     "-C",

diff --git a/examples/hpm6200evk/Cargo.toml b/examples/hpm6200evk/Cargo.toml
@@ -9,20 +9,20 @@ hpm-hal = { path = "../..", features = ["rt", "embassy", "hpm6280"] }
 # embedded helper libraries
 defmt = "0.3.8"
 defmt-rtt = "0.4.1"
-panic-halt = "0.2.0"
+panic-halt = "1.0.0"
 assign-resources = "0.4.1"
 heapless = "0.8.0"
 
 # embassy dependencies
 embassy-time = { version = "0.3.0", features = ["tick-hz-1_000_000"] }
-embassy-executor = { version = "0.6.0", features = [
-    "nightly",
+embassy-executor = { version = "0.6.3", features = [
+    # "nightly",
     "integrated-timers",
     "arch-riscv32",
     "executor-thread",
 ] }
 embassy-embedded-hal = "0.2.0"
-embassy-sync = "0.6.0"
+embassy-sync = "0.6.1"
 
 # embedded-hal ecosystem
 embedded-hal = "1.0.0"

diff --git a/examples/hpm6200evk/link-fixed.x b/examples/hpm6200evk/link-fixed.x
diff --git a/examples/hpm6200evk/memory-ram.x b/examples/hpm6200evk/memory-ram.x
@@ -7,9 +7,13 @@ MEMORY
     AHB_SRAM    : ORIGIN = 0xF0300000, LENGTH = 32K
 }
 REGION_ALIAS("REGION_TEXT", ILM0);
+REGION_ALIAS("REGION_FASTTEXT", ILM0);
+REGION_ALIAS("REGION_FASTDATA", DLM0);
 REGION_ALIAS("REGION_RODATA", ILM0);
 REGION_ALIAS("REGION_DATA", DLM0);
-REGION_ALIAS("REGION_BSS", DLM0)
+REGION_ALIAS("REGION_BSS", DLM0);
 REGION_ALIAS("REGION_HEAP", DLM0);
 REGION_ALIAS("REGION_STACK", DLM0);
-REGION_ALIAS("REGION_FASTTEXT", ILM0);
+REGION_ALIAS("REGION_NONCACHEABLE_RAM", AXI_SRAM);
+
+
diff --git a/examples/hpm6200evk/memory-xip.x b/examples/hpm6200evk/memory-xip.x
@@ -11,9 +11,12 @@ MEMORY
 }
 
 REGION_ALIAS("REGION_TEXT", XPI0_APP);
+REGION_ALIAS("REGION_FASTTEXT", ILM0);
+REGION_ALIAS("REGION_FASTDATA", DLM0);
 REGION_ALIAS("REGION_RODATA", XPI0_APP);
 REGION_ALIAS("REGION_DATA", DLM0);
-REGION_ALIAS("REGION_BSS", DLM0)
+REGION_ALIAS("REGION_BSS", DLM0);
 REGION_ALIAS("REGION_HEAP", DLM0);
 REGION_ALIAS("REGION_STACK", DLM0);
-REGION_ALIAS("REGION_FASTTEXT", ILM0);
+REGION_ALIAS("REGION_NONCACHEABLE_RAM", AXI_SRAM);
+
diff --git a/examples/hpm6200evk/memory.x b/examples/hpm6200evk/memory.x
@@ -11,9 +11,12 @@ MEMORY
 }
 
 REGION_ALIAS("REGION_TEXT", XPI0_APP);
+REGION_ALIAS("REGION_FASTTEXT", ILM0);
+REGION_ALIAS("REGION_FASTDATA", DLM0);
 REGION_ALIAS("REGION_RODATA", XPI0_APP);
 REGION_ALIAS("REGION_DATA", DLM0);
-REGION_ALIAS("REGION_BSS", DLM0)
+REGION_ALIAS("REGION_BSS", DLM0);
 REGION_ALIAS("REGION_HEAP", DLM0);
 REGION_ALIAS("REGION_STACK", DLM0);
-REGION_ALIAS("REGION_FASTTEXT", ILM0);
+REGION_ALIAS("REGION_NONCACHEABLE_RAM", AXI_SRAM);
+
diff --git a/examples/hpm6300evk/.cargo/config.toml b/examples/hpm6300evk/.cargo/config.toml
@@ -13,7 +13,7 @@ rustflags = [
     "-C",
     "link-arg=-Tdevice.x", # __VECTORED_INTERRUPTS
     "-C",
-    "link-arg=-Tlink-fixed.x",
+    "link-arg=-Tlink.x",
     "-C",
     "link-arg=-Tdefmt.x",
     "-C",

diff --git a/examples/hpm6300evk/Cargo.toml b/examples/hpm6300evk/Cargo.toml
@@ -13,9 +13,8 @@ hpm-hal = { path = "../..", features = ["rt", "embassy", "hpm6360"] }
 defmt = "0.3.8"
 defmt-rtt = "0.4.1"
 embedded-hal = "1.0.0"
-panic-halt = "0.2.0"
+panic-halt = "1.0.0"
 riscv = { version = "0.11.1", features = ["critical-section-single-hart"] }
-riscv-rt = { version = "0.12.2", features = ["single-hart"] }
 
 [profile.release]
 strip = false   # symbols are not flashed to the microcontroller, so don't strip them.