Merge pull request #132 from luojia65/luojia65/syterboot

[rust] rearrange code and implement first part of SyterBoot example

Author: luojia65

Cargo.lock

@@ -9,7 +9,7 @@ default-target = "riscv64imac-unknown-none-elf"
 [dependencies]
 panic-halt = "0.2.0"
 embedded-hal = "1.0.0"
-syterkit = { path = "../../rust" }
+syterkit = { path = "../../rust", features = ["sun20iw1"]}
 
 [[bin]]
 name = "syterkit-100ask-d1-h"

board/100ask-d1-h-rs/Cargo.toml

@@ -2,10 +2,17 @@
 #![no_main]
 
 use panic_halt as _;
-use syterkit::{entry, println, Clocks, Peripherals};
+use syterkit::{clock_dump, entry, println, show_banner, Clocks, Peripherals};
 
 #[entry]
 fn main(p: Peripherals, c: Clocks) {
-    println!("Welcome to SyterKit 100ask-d1-h package!");
-    println!("Please refer to each files in `bin` path for examples.");
+    // Display the bootloader banner.
+    show_banner();
+
+    // Initialize the DRAM.
+    let dram_size = syterkit::mctl::init();
+    println!("DRAM size: {}M 🐏", dram_size);
+
+    // Dump information about the system clocks.
+    clock_dump(&p.ccu);
 }

board/100ask-d1-h-rs/src/main.rs

@@ -1,10 +1,7 @@
-cargo-features = ["per-package-target"]
-
 [package]
 name = "syterkit"
 version = "0.0.0"
 edition = "2021"
-default-target = "riscv64imac-unknown-none-elf"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,6 +14,9 @@ embedded-io = "0.6.1"
 spin = "0.9"
 syterkit-macros = { path = "macros" }
 
+[build-dependencies]
+rustc_version = "0.4.1"
+
 [lib]
 name = "syterkit"
 test = false
@@ -26,3 +26,5 @@ bench = false
 default = ["nezha"]
 nezha = []
 lichee = []
+
+sun20iw1 = []

rust/Cargo.toml

@@ -0,0 +1,35 @@
+use std::process::Command;
+
+fn main() {
+    let output = Command::new("git").args(&["rev-parse", "HEAD"]).output();
+    match output {
+        Ok(output) => {
+            let git_hash = String::from_utf8(output.stdout).unwrap();
+            let git_hash = &git_hash[..8];
+            println!("cargo:rustc-env=SYTERKIT_GIT_HASH={}", git_hash);
+        }
+        Err(e) => {
+            panic!(
+                "git command failed on host when compiling SyterKit: {}
+during compilation, git must be found, as it is used to generate the git hash version of the current package.",
+                e
+            );
+        }
+    }
+    let syterkit_rustc_version = {
+        let version = rustc_version::version_meta().unwrap();
+        let hash_date_extra = match (version.commit_hash, version.commit_date) {
+            (Some(commit_hash), Some(commit_date)) => {
+                format!(" ({} {})", &commit_hash[..8], commit_date)
+            }
+            (Some(commit_hash), None) => format!(" ({})", &commit_hash[..8]),
+            (None, Some(commit_date)) => format!(" ({})", commit_date),
+            (None, None) => "".to_string(),
+        };
+        format!("{}{}", version.semver, hash_date_extra)
+    };
+    println!(
+        "cargo:rustc-env=SYTERKIT_RUSTC_VERSION={}",
+        syterkit_rustc_version
+    );
+}

rust/build.rs

@@ -1,6 +1,6 @@
 [package]
 name = "syterkit-macros"
-version = "0.1.0"
+version = "0.0.0"
 edition = "2021"
 
 [lib]

rust/macros/Cargo.toml

@@ -6,7 +6,7 @@ use syn::{
 
 use proc_macro::TokenStream;
 
-/// ROM stage function entry.
+/// SyterKit ROM stage function entry.
 #[proc_macro_attribute]
 pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream {
     let f = parse_macro_input!(input as ItemFn);