From 1dd08f7eaa0a2be64fec7835a46ce7754517cd20 Mon Sep 17 00:00:00 2001
From: Yifan Wu <shinbokuow@163.com>
Date: Tue, 2 Feb 2021 16:30:29 +0800
Subject: [PATCH] Update os/Makefile && Update rust to 2021-01-30

---
 os/Makefile    | 16 ++++++++--------
 rust-toolchain |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/os/Makefile b/os/Makefile
index 1732b238..b55c71f6 100644
--- a/os/Makefile
+++ b/os/Makefile
@@ -7,13 +7,13 @@ KERNEL_ENTRY_PA := 0x80020000
 DISASM_TMP := target/$(TARGET)/$(MODE)/asm
 
 # BOARD
-BOARD		?= qemu
-SBI			?= rustsbi
-BOOTLOADER	:= ../bootloader/$(SBI)-$(BOARD).bin
+BOARD ?= qemu
+SBI ?= rustsbi
+BOOTLOADER := ../bootloader/$(SBI)-$(BOARD).bin
 
 # Run K210
 K210-SERIALPORT	= /dev/ttyUSB0
-K210-BURNER		= ../tools/kflash.py
+K210-BURNER = ../tools/kflash.py
 
 # Binutils
 OBJDUMP := rust-objdump --arch-name=riscv64
@@ -25,10 +25,10 @@ DISASM ?= -x
 build: env $(KERNEL_BIN)
 
 env:
-	(rustup component list | grep "rust-src") || rustup component add rust-src
-	(rustup component list | grep "llvm-tools-preview") || rustup component add llvm-tools-preview
-	(which rust-objdump) || cargo install cargo-binutils
-	(rustup target list | grep "riscv64gc-unknown-none-elf") || rustup target add riscv64gc-unknown-none-elf
+	(rustup target list | grep "riscv64gc-unknown-none-elf (installed)") || rustup target add $(TARGET)
+	cargo install cargo-binutils
+	rustup component add rust-src
+	rustup component add llvm-tools-preview
 
 $(KERNEL_BIN): kernel
 	@$(OBJCOPY) $(KERNEL_ELF) --strip-all -O binary $@
diff --git a/rust-toolchain b/rust-toolchain
index bf867e0a..a08f00d1 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly
+nightly-2021-01-30