Merge pull request #138 from luojia65/luojia65/cli

[board] cli support on 100ask-d1-h, rearrange mctl module (take 2)
YuzukiHD · Oct 7, 2024 · d0ed118 · d0ed118
2 parents 6c32fc4 + 486caa8
commit d0ed118
Show file tree

Hide file tree

Showing 8 changed files with 710 additions and 363 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/board/100ask-d1-h-rs/Cargo.toml b/board/100ask-d1-h-rs/Cargo.toml
@@ -7,9 +7,13 @@ edition = "2021"
 default-target = "riscv64imac-unknown-none-elf"
 
 [dependencies]
-panic-halt = "0.2.0"
 embedded-hal = "1.0.0"
+embedded-cli = "0.2.1"
+embedded-io = "0.6.1"
+panic-halt = "0.2.0"
 syterkit = { path = "../../rust", features = ["sun20iw1"]}
+ufmt = "0.2.0"
+num-traits = { version = "0.2.19", default-features = false }
 
 [[bin]]
 name = "syterkit-100ask-d1-h"

diff --git a/board/100ask-d1-h-rs/src/bin/init-dram.rs b/board/100ask-d1-h-rs/src/bin/init-dram.rs
@@ -7,6 +7,6 @@ use syterkit::{entry, mctl, println, Clocks, Peripherals};
 #[entry]
 fn main(p: Peripherals, _c: Clocks) {
     println!("DDR Init");
-    let ram_size = mctl::init(&p.ccu);
+    let ram_size = mctl::init(&p.ccu, &p.phy);
     println!("{}M 🐏", ram_size);
 }