From 74f7a23bd6cdc9ec4eece7732b691c15cfac6b3a Mon Sep 17 00:00:00 2001
From: YdrMaster <ydrml@hotmail.com>
Date: Tue, 10 May 2022 14:07:40 +0800
Subject: [PATCH] build: update deps

---
 drivers/Cargo.toml    | 4 +---
 kernel-hal/Cargo.toml | 4 +---
 rust-toolchain.toml   | 2 +-
 zCore/Cargo.toml      | 6 ++----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/Cargo.toml b/drivers/Cargo.toml
index 85b78cfa..77f1d757 100644
--- a/drivers/Cargo.toml
+++ b/drivers/Cargo.toml
@@ -54,6 +54,4 @@ x2apic = "0.4"
 x86_64 = "0.14"
 
 [target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "cd31989", features = [
-    "inline-asm",
-] }
+riscv = "0.8"
diff --git a/kernel-hal/Cargo.toml b/kernel-hal/Cargo.toml
index e49ebd7c..ef057d95 100644
--- a/kernel-hal/Cargo.toml
+++ b/kernel-hal/Cargo.toml
@@ -73,6 +73,4 @@ x86-smpboot = { git = "https://github.com/rcore-os/x86-smpboot", rev = "1069df3"
 
 # Bare-metal mode on riscv64
 [target.'cfg(all(target_os = "none", target_arch = "riscv64"))'.dependencies]
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "cd31989", features = [
-    "inline-asm",
-] }
+riscv = "0.8"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index e8908899..7cc4239f 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 channel = "nightly-2022-01-20"
 components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"]
-targets = ["riscv64gc-unknown-none-elf"]
+targets = ["riscv64imac-unknown-none-elf"]
diff --git a/zCore/Cargo.toml b/zCore/Cargo.toml
index d92cc0f4..7c292535 100644
--- a/zCore/Cargo.toml
+++ b/zCore/Cargo.toml
@@ -80,9 +80,7 @@ buddy_system_allocator = "0.8"
 # RISC-V
 [target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
 r0 = "1"
-riscv = { git = "https://github.com/rust-embedded/riscv", rev = "cd31989", features = [
-    "inline-asm",
-] }
+riscv = "0.8"
 
 # Bare-metal mode on x86_64
 [target.'cfg(all(target_os = "none", target_arch = "x86_64"))'.dependencies]
@@ -92,4 +90,4 @@ rboot = { git = "https://github.com/rcore-os/rboot.git", rev = "39d6e24", defaul
 # Bare-metal mode on x86_64
 [target.'cfg(all(target_os = "none", not(target_arch = "x86_64")))'.dependencies]
 serde = { version = "1.0", default-features = false, features = ["derive"] }
-serde-device-tree = { git = "https://github.com/YdrMaster/serde-device-tree.git", rev = "af8605f", default-features = false }
+serde-device-tree = { git = "https://github.com/rustsbi/serde-device-tree.git", rev = "114679a", default-features = false }