Update os/Makefile && Update rust to 2021-01-30

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 $@

rust-toolchain

@@ -1 +1 @@
-nightly
+nightly-2021-01-30